[Playerstage-commit] code/player/server/drivers/camera/1394 camera1394.cc, 1.30, 1.31

[Toby C. <th...@us...>]

Update of /cvsroot/playerstage/code/player/server/drivers/camera/1394
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14592/server/drivers/camera/1394

Modified Files:
	camera1394.cc 
Log Message:
tweaked dc1394 checks so that it checks for v2 first, also fixed directives
so that it will actually compile with v1


Index: camera1394.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/camera/1394/camera1394.cc,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** camera1394.cc	15 Nov 2006 00:05:58 -0000	1.30
--- camera1394.cc	15 Nov 2006 19:01:34 -0000	1.31
***************
*** 1109,1114 ****
    int  i, j;
    unsigned char * ptr1, * ptr2, * dst;
    dc1394video_frame_t * frame = NULL;
! 
    switch (this->method)
    {
--- 1109,1115 ----
    int  i, j;
    unsigned char * ptr1, * ptr2, * dst;
+ #if LIBDC1394_VERSION == 0200
    dc1394video_frame_t * frame = NULL;
! #endif
    switch (this->method)
    {