[GEM-cvs] Gem/src/Pixes pix_videoNEW.cpp,1.14,1.15 pix_videoNEW.h,1.11,1.12

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

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

Modified Files:
	pix_videoNEW.cpp pix_videoNEW.h 
Log Message:
better check whether switching to another driver succeeds


Index: pix_videoNEW.cpp
===================================================================
RCS file: /cvsroot/pd-gem/Gem/src/Pixes/pix_videoNEW.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pix_videoNEW.cpp	20 Oct 2005 10:03:25 -0000	1.14
--- pix_videoNEW.cpp	14 Dec 2005 13:07:43 -0000	1.15
***************
*** 32,37 ****
  //
  /////////////////////////////////////////////////////////
! pix_videoNEW :: pix_videoNEW(){
!   m_videoHandle=NULL;
    int i = MAX_VIDEO_HANDLES;
    while(i--)m_videoHandles[i]=NULL;
--- 32,38 ----
  //
  /////////////////////////////////////////////////////////
! pix_videoNEW :: pix_videoNEW() : 
!   m_videoHandle(NULL), m_driver(-1)
! {
    int i = MAX_VIDEO_HANDLES;
    while(i--)m_videoHandles[i]=NULL;
***************
*** 163,175 ****
  void pix_videoNEW :: driverMess(int dev)
  {
! //  post("driver: %d", dev);
    if(dev>=m_numVideoHandles){
      post("driverID (%d) must not exceed %d", dev, m_numVideoHandles);
      return;
    }
!   if(m_videoHandle==m_videoHandles[dev])return;
!   //  if(m_videoHandle)m_videoHandle->stopTransfer();
!   m_videoHandle=m_videoHandles[dev];
!   //  if(m_videoHandle)m_videoHandle->startTransfer();
  }
  /////////////////////////////////////////////////////////
--- 164,178 ----
  void pix_videoNEW :: driverMess(int dev)
  {
!   //  post("driver: %d", dev);
    if(dev>=m_numVideoHandles){
      post("driverID (%d) must not exceed %d", dev, m_numVideoHandles);
      return;
    }
!   if((dev!=m_driver) && (m_videoHandle!=m_videoHandles[dev])){
!     if(m_videoHandle)m_videoHandle->stopTransfer();
!     m_videoHandle=m_videoHandles[dev];
!     if(m_videoHandle)m_videoHandle->startTransfer();
!     m_driver=dev;
!   }
  }
  /////////////////////////////////////////////////////////
***************
*** 185,188 ****
--- 188,192 ----
    int err=0;
    if (m_videoHandle)err=m_videoHandle->setDevice(s->s_name);
+   post("device-err: %d", err);
    if(!err){
      int d=0;

Index: pix_videoNEW.h
===================================================================
RCS file: /cvsroot/pd-gem/Gem/src/Pixes/pix_videoNEW.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pix_videoNEW.h	20 Oct 2005 10:03:25 -0000	1.11
--- pix_videoNEW.h	14 Dec 2005 13:07:43 -0000	1.12
***************
*** 114,117 ****
--- 114,119 ----
    int    m_numVideoHandles;
  
+   int    m_driver;
+ 
   private: