Update of /cvsroot/playerstage/code/player/utils/playercam
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7522/utils/playercam
Modified Files:
Tag: release-2-0-patches
playercam.c
Log Message:
more backports from HEAD
Index: playercam.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/utils/playercam/playercam.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** playercam.c 20 Jan 2006 21:26:31 -0000 1.8
--- playercam.c 9 Jun 2006 18:13:51 -0000 1.8.2.1
***************
*** 163,167 ****
" -i <index> : the index of the camera\n"
" -b <index> : the index of the blobfinder\n"
! " -r <rate> : the refresh rate of the video\n\n"
"Currently supports RGB888 and 8-bit grey scale images.\n\n");
}
--- 163,167 ----
" -i <index> : the index of the camera\n"
" -b <index> : the index of the blobfinder\n"
! " -r <rate> : the refresh rate of the video\n"
"Currently supports RGB888 and 8-bit grey scale images.\n\n");
}
***************
*** 199,207 ****
}
- gdk_draw_pixbuf(GTK_WIDGET(drawing_area)->window, gc,
- g_pixbuf, 0, 0, 0, 0, g_width, g_height,
- GDK_RGB_DITHER_NONE, 0, 0);
-
-
// scale everything at the end
if ((g_width==g_window_width)&&(g_height==g_window_height))
--- 199,202 ----
***************
*** 340,344 ****
player_init(int argc, char *argv[])
{
! int csize, usize;
if(get_options(argc, argv) < 0)
--- 335,339 ----
player_init(int argc, char *argv[])
{
! int csize, usize, i;
if(get_options(argc, argv) < 0)
***************
*** 390,395 ****
}
! // Get 1 image for the image size
! if (NULL != playerc_client_read(g_client))
{
if (NULL != g_camera)
--- 385,390 ----
}
! // Get up to 10 images until we have a valid frame (g_wdith > 0)
! for (i=0, g_width=0; i < 10 && g_width==0 && NULL !=
playerc_client_read(g_client); ++i)
{
if (NULL != g_camera)
***************
*** 424,427 ****
--- 419,425 ----
assert(g_width>0);
assert(g_height>0);
+
+ playerc_client_datamode(g_client,PLAYER_DATAMODE_PULL);
+ playerc_client_set_replace_rule(g_client,-1,-1,PLAYER_MSGTYPE_DATA,-1,1);
}
***************
*** 477,481 ****
(g_height != g_blobfinder->height))
{
! g_print("camera and blobfinder height or width do not match\n");
// should we die here?
//exit(-1);
--- 475,479 ----
(g_height != g_blobfinder->height))
{
! g_print("camera and blobfinder height or width do not match %d,%d !=
%d,%d\n",g_width,g_height,g_blobfinder->width,g_blobfinder->height);
// should we die here?
//exit(-1);
***************
*** 486,490 ****
{
g_print("ERROR reading player g_client\n");
! exit(-1);
}
}
--- 484,488 ----
{
g_print("ERROR reading player g_client\n");
! //exit(-1);
}
}
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
