[GEM-cvs] Gem/src/Pixes videoDV4L.h,1.6,1.7 videoDV4L.cpp,1.8,1.9

[IOhannes m z. <zmo...@us...>]

Update of /cvsroot/pd-gem/Gem/src/Pixes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10669

Modified Files:
	videoDV4L.h videoDV4L.cpp 
Log Message:
use the dv1394.h from the kernel and not the deprecated-one from libdv-dev

Index: videoDV4L.cpp
===================================================================
RCS file: /cvsroot/pd-gem/Gem/src/Pixes/videoDV4L.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** videoDV4L.cpp	12 Feb 2004 17:28:34 -0000	1.8
--- videoDV4L.cpp	12 Oct 2004 11:51:18 -0000	1.9
***************
*** 75,83 ****
    /* this will hang if no ieee1394-device is present, what to do about it ??? */
    me->m_haveVideo=false;
!   if(ioctl(fd, DV1394_WAIT_FRAMES, 1)) {
      perror("error: ioctl WAIT_FRAMES");
      me->m_capturing=false; return NULL;
    }
!   if (ioctl(fd, DV1394_GET_STATUS, &dvst))   {
      perror("ioctl GET_STATUS");
      me->m_capturing=false; return NULL;
--- 75,83 ----
    /* this will hang if no ieee1394-device is present, what to do about it ??? */
    me->m_haveVideo=false;
!   if(ioctl(fd, DV1394_IOC_WAIT_FRAMES, 1)) {
      perror("error: ioctl WAIT_FRAMES");
      me->m_capturing=false; return NULL;
    }
!   if (ioctl(fd, DV1394_IOC_GET_STATUS, &dvst))   {
      perror("ioctl GET_STATUS");
      me->m_capturing=false; return NULL;
***************
*** 87,95 ****
  
    while(me->m_continue_thread){
!     if(ioctl(fd, DV1394_WAIT_FRAMES, n_frames - 1)) {
        perror("error: ioctl WAIT_FRAMES");
        me->m_capturing=false; return NULL;
      }
!     if (ioctl(fd, DV1394_GET_STATUS, &dvst))   {
        perror("ioctl GET_STATUS");
        me->m_capturing=false; return NULL;
--- 87,95 ----
  
    while(me->m_continue_thread){
!     if(ioctl(fd, DV1394_IOC_WAIT_FRAMES, n_frames - 1)) {
        perror("error: ioctl WAIT_FRAMES");
        me->m_capturing=false; return NULL;
      }
!     if (ioctl(fd, DV1394_IOC_GET_STATUS, &dvst))   {
        perror("ioctl GET_STATUS");
        me->m_capturing=false; return NULL;
***************
*** 113,117 ****
  
      //post("thread %d\t%x %x", me->frame, me->tvfd, me->vmmap);
!     if (ioctl(fd, DV1394_RECEIVE_FRAMES, 1) < 0)    {
        perror("receiving...");
      }
--- 113,117 ----
  
      //post("thread %d\t%x %x", me->frame, me->tvfd, me->vmmap);
!     if (ioctl(fd, DV1394_IOC_RECEIVE_FRAMES, 1) < 0)    {
        perror("receiving...");
      }
***************
*** 194,198 ****
    }
  
!   if (ioctl(fd, DV1394_INIT, &init) < 0)    {
      perror("initializing");
      close(fd);
--- 194,198 ----
    }
  
!   if (ioctl(fd, DV1394_IOC_INIT, &init) < 0)    {
      perror("initializing");
      close(fd);
***************
*** 208,212 ****
    }
    
!   if(ioctl(fd, DV1394_START_RECEIVE, NULL)) {
      perror("dv1394 START_RECEIVE ioctl");
      close(fd);
--- 208,212 ----
    }
    
!   if(ioctl(fd, DV1394_IOC_START_RECEIVE, NULL)) {
      perror("dv1394 START_RECEIVE ioctl");
      close(fd);
***************
*** 279,283 ****
      while(m_capturing){usleep(10);i++;}
      post("shutting down dv1394 after %d usec", i*10);
!     ioctl(dvfd, DV1394_SHUTDOWN);
    }
    closeDevice();
--- 279,283 ----
      while(m_capturing){usleep(10);i++;}
      post("shutting down dv1394 after %d usec", i*10);
!     ioctl(dvfd, DV1394_IOC_SHUTDOWN);
    }
    closeDevice();

Index: videoDV4L.h
===================================================================
RCS file: /cvsroot/pd-gem/Gem/src/Pixes/videoDV4L.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** videoDV4L.h	12 Feb 2004 17:28:34 -0000	1.6
--- videoDV4L.h	12 Oct 2004 11:51:18 -0000	1.7
***************
*** 25,29 ****
  #include "Pixes/video.h"
  #ifdef HAVE_DV
! #include <libdv/dv1394.h>
  #include <libdv/dv.h>
  
--- 25,30 ----
  #include "Pixes/video.h"
  #ifdef HAVE_DV
! // you will have to add "/usr/src/linux/drivers" to your include-path
! #include <ieee1394/dv1394.h>
  #include <libdv/dv.h>