Revision: 4433
          http://pd-gem.svn.sourceforge.net/pd-gem/?rev=4433&view=rev
Author:   zmoelnig
Date:     2011-08-08 14:25:41 +0000 (Mon, 08 Aug 2011)

Log Message:
-----------
adapt to video -> video|videoBase split

Modified Paths:
--------------
    trunk/Gem/plugins/videoAVT/videoAVT.cpp
    trunk/Gem/plugins/videoAVT/videoAVT.h
    trunk/Gem/plugins/videoDC1394/videoDC1394.cpp
    trunk/Gem/plugins/videoDC1394/videoDC1394.h
    trunk/Gem/plugins/videoDS/videoDS.cpp
    trunk/Gem/plugins/videoDS/videoDS.h
    trunk/Gem/plugins/videoDV4L/videoDV4L.cpp
    trunk/Gem/plugins/videoDV4L/videoDV4L.h
    trunk/Gem/plugins/videoDarwin/videoDarwin.cpp
    trunk/Gem/plugins/videoDarwin/videoDarwin.h
    trunk/Gem/plugins/videoHALCON/videoHALCON.cpp
    trunk/Gem/plugins/videoHALCON/videoHALCON.h
    trunk/Gem/plugins/videoPYLON/videoPYLON.cpp
    trunk/Gem/plugins/videoPYLON/videoPYLON.h
    trunk/Gem/plugins/videoSGI/videoSGI.cpp
    trunk/Gem/plugins/videoSGI/videoSGI.h
    trunk/Gem/plugins/videoUNICAP/videoUNICAP.cpp
    trunk/Gem/plugins/videoUNICAP/videoUNICAP.h
    trunk/Gem/plugins/videoV4L/videoV4L.cpp
    trunk/Gem/plugins/videoV4L/videoV4L.h
    trunk/Gem/plugins/videoV4L2/videoV4L2.cpp
    trunk/Gem/plugins/videoV4L2/videoV4L2.h
    trunk/Gem/plugins/videoVFW/videoVFW.cpp
    trunk/Gem/plugins/videoVFW/videoVFW.h

Modified: trunk/Gem/plugins/videoAVT/videoAVT.cpp
===================================================================
--- trunk/Gem/plugins/videoAVT/videoAVT.cpp     2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoAVT/videoAVT.cpp     2011-08-08 14:25:41 UTC (rev 
4433)
@@ -71,7 +71,7 @@
  }
 };
 
-videoAVT :: videoAVT() : video("avt"),
+videoAVT :: videoAVT() : videoBase("avt"),
                                m_grabber(NULL)
 {
   m_width=0;
@@ -561,7 +561,7 @@
 
 
 #else
-videoAVT :: videoAVT() : video("")
+videoAVT :: videoAVT() : videoBase("")
 { }
 videoAVT :: ~videoAVT()
 { }

Modified: trunk/Gem/plugins/videoAVT/videoAVT.h
===================================================================
--- trunk/Gem/plugins/videoAVT/videoAVT.h       2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoAVT/videoAVT.h       2011-08-08 14:25:41 UTC (rev 
4433)
@@ -15,7 +15,7 @@
 #ifndef INCLUDE_VIDEOAVT_H_
 #define INCLUDE_VIDEOAVT_H_
 
-#include "plugins/video.h"
+#include "plugins/videoBase.h"
 
 #if defined  HAVE_LIBPVAPI
 # define HAVE_AVT
@@ -66,7 +66,7 @@
     
 -----------------------------------------------------------------*/
 namespace gem { namespace plugins {
- class GEM_EXPORT videoAVT : public video {
+ class GEM_EXPORT videoAVT : public videoBase {
     public:
         //////////
         // Constructor
@@ -74,7 +74,7 @@
                
        //////////
        // Destructor
-       virtual ~videoAVT();
+       virtual ~videoAVT(void);
 
 #ifdef HAVE_AVT
        ////////
@@ -85,15 +85,15 @@
        //////////
        // Start up the video device
        // [out] int - returns 0 if bad
-       virtual bool            startTransfer();
+       virtual bool            startTransfer(void);
        //////////
        // Stop the video device
        // [out] int - returns 0 if bad
-       virtual bool            stopTransfer();
+       virtual bool            stopTransfer(void);
 
        //////////
        // get the next frame
-       virtual bool grabFrame();
+       virtual bool grabFrame(void);
 
        virtual std::vector<std::string>enumerate(void);
 

Modified: trunk/Gem/plugins/videoDC1394/videoDC1394.cpp
===================================================================
--- trunk/Gem/plugins/videoDC1394/videoDC1394.cpp       2011-08-08 14:24:10 UTC 
(rev 4432)
+++ trunk/Gem/plugins/videoDC1394/videoDC1394.cpp       2011-08-08 14:25:41 UTC 
(rev 4433)
@@ -36,7 +36,7 @@
 // Constructor
 //
 /////////////////////////////////////////////////////////
-videoDC1394 :: videoDC1394() : video("dc1394"),
+videoDC1394 :: videoDC1394() : videoBase("dc1394"),
                                m_dccamera(NULL),
                                m_dcframe(NULL),
                                m_dc(NULL)
@@ -754,7 +754,7 @@
 
 
 #else
-videoDC1394 :: videoDC1394() : video("")
+videoDC1394 :: videoDC1394() : videoBase("")
 {}
 videoDC1394 :: ~videoDC1394()
 {}

Modified: trunk/Gem/plugins/videoDC1394/videoDC1394.h
===================================================================
--- trunk/Gem/plugins/videoDC1394/videoDC1394.h 2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoDC1394/videoDC1394.h 2011-08-08 14:25:41 UTC (rev 
4433)
@@ -16,7 +16,7 @@
 
 #ifndef INCLUDE_VIDEODC1394_H_
 #define INCLUDE_VIDEODC1394_H_
-#include "plugins/video.h"
+#include "plugins/videoBase.h"
 
 
 #ifdef HAVE_LIBDC1394
@@ -42,7 +42,7 @@
 
 -----------------------------------------------------------------*/
 namespace gem { namespace plugins {
- class GEM_EXPORT videoDC1394 : public video {
+ class GEM_EXPORT videoDC1394 : public videoBase {
     public:
         //////////
         // Constructor
@@ -50,7 +50,7 @@
                
        //////////
        // Destructor
-       virtual ~videoDC1394();
+       virtual ~videoDC1394(void);
 #ifdef HAVE_LIBDC1394
        ////////
        // open the video-device
@@ -68,7 +68,7 @@
 
        //////////
        // get the next frame
-       bool    grabFrame();
+       bool    grabFrame(void);
 
        //////////
        // Set the video dimensions

Modified: trunk/Gem/plugins/videoDS/videoDS.cpp
===================================================================
--- trunk/Gem/plugins/videoDS/videoDS.cpp       2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoDS/videoDS.cpp       2011-08-08 14:25:41 UTC (rev 
4433)
@@ -61,7 +61,7 @@
 //
 /////////////////////////////////////////////////////////
 videoDS :: videoDS(void)
-  : video("directshow", 0),
+  : videoBase("directshow", 0),
 m_readIdx (0), m_lastreadIdx (0),
 m_writeIdx(0), m_lastwriteIdx(0),
 m_format(GL_BGR_EXT),
@@ -1247,6 +1247,6 @@
     }
 }
 #else /* !HAVE_DIRECTSHOW */
-videoDS ::  videoDS() : video("") {}
+videoDS ::  videoDS() : videoBase("") {}
 videoDS :: ~videoDS() {}
 #endif

Modified: trunk/Gem/plugins/videoDS/videoDS.h
===================================================================
--- trunk/Gem/plugins/videoDS/videoDS.h 2011-08-08 14:24:10 UTC (rev 4432)
+++ trunk/Gem/plugins/videoDS/videoDS.h 2011-08-08 14:25:41 UTC (rev 4433)
@@ -12,7 +12,7 @@
 #ifndef INCLUDE_VIDEODS_H_
 #define INCLUDE_VIDEODS_H_
 
-#include "plugins/video.h"
+#include "plugins/videoBase.h"
 
 #ifdef HAVE_DIRECTSHOW
 # include <dshow.h>
@@ -31,7 +31,7 @@
     
   -----------------------------------------------------------------*/
 namespace gem { namespace plugins {
- class GEM_EXPORT videoDS : public video {
+ class GEM_EXPORT videoDS : public videoBase {
   public:
     //////////
     // Constructor

Modified: trunk/Gem/plugins/videoDV4L/videoDV4L.cpp
===================================================================
--- trunk/Gem/plugins/videoDV4L/videoDV4L.cpp   2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoDV4L/videoDV4L.cpp   2011-08-08 14:25:41 UTC (rev 
4433)
@@ -44,7 +44,7 @@
 //
 /////////////////////////////////////////////////////////
 
-videoDV4L :: videoDV4L() : video("dv4l"),
+videoDV4L :: videoDV4L() : videoBase("dv4l"),
                            m_raw(NULL),
                            m_decoder(NULL),
                            m_parsed(false),
@@ -489,7 +489,7 @@
 //
 // videoDV4L without DV-support
 //
-videoDV4L :: videoDV4L() : video("")
+videoDV4L :: videoDV4L() : videoBase("")
 { }
 videoDV4L :: ~videoDV4L()
 { }

Modified: trunk/Gem/plugins/videoDV4L/videoDV4L.h
===================================================================
--- trunk/Gem/plugins/videoDV4L/videoDV4L.h     2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoDV4L/videoDV4L.h     2011-08-08 14:25:41 UTC (rev 
4433)
@@ -16,7 +16,7 @@
 
 #ifndef INCLUDE_VIDEODV4L_H_
 #define INCLUDE_VIDEODV4L_H_
-#include "plugins/video.h"
+#include "plugins/videoBase.h"
 
 #if defined HAVE_LIBIEC61883 && defined HAVE_LIBRAW1394 && defined HAVE_LIBDV
 # define HAVE_DV
@@ -60,7 +60,7 @@
     
 -----------------------------------------------------------------*/
 namespace gem { namespace plugins {
- class GEM_EXPORT videoDV4L : public video {
+ class GEM_EXPORT videoDV4L : public videoBase {
     public:
         //////////
         // Constructor
@@ -68,7 +68,7 @@
                
        //////////
        // Destructor
-       virtual ~videoDV4L();
+       virtual ~videoDV4L(void);
 #ifdef HAVE_DV
        ////////
        // open the video-device
@@ -78,11 +78,11 @@
   //////////
   // Start up the video device
   // [out] int - returns 0 if bad
-  bool         startTransfer();
+  bool         startTransfer(void);
        //////////
   // Stop the video device
   // returns TRUE is transfer was running, FALSE is otherwise
-  bool         stopTransfer();
+  bool         stopTransfer(void);
 
        //////////
        // get the next frame

Modified: trunk/Gem/plugins/videoDarwin/videoDarwin.cpp
===================================================================
--- trunk/Gem/plugins/videoDarwin/videoDarwin.cpp       2011-08-08 14:24:10 UTC 
(rev 4432)
+++ trunk/Gem/plugins/videoDarwin/videoDarwin.cpp       2011-08-08 14:25:41 UTC 
(rev 4433)
@@ -49,7 +49,7 @@
 REGISTER_VIDEOFACTORY("Darwin", videoDarwin);
 
 videoDarwin :: videoDarwin() 
-  : video("darwin", 0),
+  : videoBase("darwin", 0),
     m_newFrame(false),
     m_srcGWorld(NULL),
     m_quality(channelPlayNormal),

Modified: trunk/Gem/plugins/videoDarwin/videoDarwin.h
===================================================================
--- trunk/Gem/plugins/videoDarwin/videoDarwin.h 2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoDarwin/videoDarwin.h 2011-08-08 14:25:41 UTC (rev 
4433)
@@ -14,7 +14,7 @@
 #ifndef INCLUDE_VIDEODARWIN_H_
 #define INCLUDE_VIDEODARWIN_H_
 
-#include "plugins/video.h"
+#include "plugins/videoBase.h"
 
 #ifdef HAVE_CARBON
 # include <Carbon/Carbon.h>
@@ -36,7 +36,7 @@
     
   -----------------------------------------------------------------*/
 namespace gem { namespace plugins {
-class GEM_EXPORT videoDarwin : public video {
+class GEM_EXPORT videoDarwin : public videoBase {
                  public:
    //////////
    // Constructor
@@ -44,7 +44,7 @@
                
    //////////
    // Destructor
-   virtual ~videoDarwin();
+   virtual ~videoDarwin(void);
     
    ////////
    // open the video-device
@@ -54,11 +54,11 @@
    //////////
    // Start up the video device
    // [out] int - returns 0 if bad
-   bool                startTransfer();
+   bool                startTransfer(void);
    //////////
    // Stop the video device
    // [out] int - returns 0 if bad
-   bool                stopTransfer();
+   bool                stopTransfer(void);
 
    //////////
    // get the next frame
@@ -75,10 +75,10 @@
    virtual void getProperties(gem::Properties&props);
       
                  protected:
-   bool initSeqGrabber();
-   void resetSeqGrabber();
-   void destroySeqGrabber();
-   virtual void    setupCapture();
+   bool initSeqGrabber(void);
+   void resetSeqGrabber(void);
+   void destroySeqGrabber(void);
+   virtual void    setupCapture(void);
    
 
    

Modified: trunk/Gem/plugins/videoHALCON/videoHALCON.cpp
===================================================================
--- trunk/Gem/plugins/videoHALCON/videoHALCON.cpp       2011-08-08 14:24:10 UTC 
(rev 4432)
+++ trunk/Gem/plugins/videoHALCON/videoHALCON.cpp       2011-08-08 14:25:41 UTC 
(rev 4433)
@@ -97,7 +97,7 @@
   throw except;        
 }
 
-videoHALCON :: videoHALCON() : video("halcon"),
+videoHALCON :: videoHALCON() : videoBase("halcon"),
                                m_grabber(NULL)
 {
   m_width=0;
@@ -686,7 +686,7 @@
   }
 }
 #else
-videoHALCON :: videoHALCON() : video("")
+videoHALCON :: videoHALCON() : videoBase("")
 { }
 videoHALCON :: ~videoHALCON()
 { }

Modified: trunk/Gem/plugins/videoHALCON/videoHALCON.h
===================================================================
--- trunk/Gem/plugins/videoHALCON/videoHALCON.h 2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoHALCON/videoHALCON.h 2011-08-08 14:25:41 UTC (rev 
4433)
@@ -21,7 +21,7 @@
 #ifndef INCLUDE_VIDEOHALCON_H_
 #define INCLUDE_VIDEOHALCON_H_
 
-#include "plugins/video.h"
+#include "plugins/videoBase.h"
 
 #include <map>
 
@@ -53,7 +53,7 @@
 
 -----------------------------------------------------------------*/
 namespace gem { namespace plugins {
- class GEM_EXPORT videoHALCON : public video {
+ class GEM_EXPORT videoHALCON : public videoBase {
     public:
         //////////
         // Constructor
@@ -61,7 +61,7 @@
                
        //////////
        // Destructor
-       virtual ~videoHALCON();
+       virtual ~videoHALCON(void);
 
 #ifdef HAVE_HALCON
        ////////
@@ -72,15 +72,15 @@
        //////////
        // Start up the video device
        // [out] int - returns 0 if bad
-       bool            startTransfer();
+       bool            startTransfer(void);
        //////////
        // Stop the video device
        // [out] int - returns 0 if bad
-       bool            stopTransfer();
+       bool            stopTransfer(void);
 
        //////////
        // get the next frame
-       bool grabFrame();
+       bool grabFrame(void);
 
   virtual std::vector<std::string>enumerate(void);
 

Modified: trunk/Gem/plugins/videoPYLON/videoPYLON.cpp
===================================================================
--- trunk/Gem/plugins/videoPYLON/videoPYLON.cpp 2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoPYLON/videoPYLON.cpp 2011-08-08 14:25:41 UTC (rev 
4433)
@@ -308,7 +308,7 @@
 
 REGISTER_VIDEOFACTORY("pylon", videoPYLON);
 
-videoPYLON :: videoPYLON() : video("pylon")
+videoPYLON :: videoPYLON() : videoBase("pylon")
                            , m_factory(NULL)
                            , m_camera(NULL)
                            , m_grabber(NULL)

Modified: trunk/Gem/plugins/videoPYLON/videoPYLON.h
===================================================================
--- trunk/Gem/plugins/videoPYLON/videoPYLON.h   2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoPYLON/videoPYLON.h   2011-08-08 14:25:41 UTC (rev 
4433)
@@ -17,7 +17,7 @@
 #ifndef INCLUDE_VIDEOPYLON_H_
 #define INCLUDE_VIDEOPYLON_H_
 
-#include "plugins/video.h"
+#include "plugins/videoBase.h"
 #include <map>
 
 #ifdef Status
@@ -54,7 +54,7 @@
     
 -----------------------------------------------------------------*/
 namespace gem { namespace plugins {
- class GEM_EXPORT videoPYLON : public video {
+ class GEM_EXPORT videoPYLON : public videoBase {
     public:
     //////////
     // Constructor
@@ -62,7 +62,7 @@
                
     //////////
     // Destructor
-    virtual ~videoPYLON();
+    virtual ~videoPYLON(void);
 
     ////////
     // open the video-device

Modified: trunk/Gem/plugins/videoSGI/videoSGI.cpp
===================================================================
--- trunk/Gem/plugins/videoSGI/videoSGI.cpp     2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoSGI/videoSGI.cpp     2011-08-08 14:25:41 UTC (rev 
4433)
@@ -51,7 +51,7 @@
 //
 /////////////////////////////////////////////////////////
 videoSGI :: videoSGI() 
-  : video("sgi", 0),
+  : videoBase("sgi", 0),
     m_haveVideo(0), m_swap(1), m_colorSwap(0),
     m_svr(NULL), m_drn(NULL), m_src(NULL), m_path(NULL)
 {
@@ -396,6 +396,6 @@
   return result;
 }
 #else /* !HAVE_VL_VL_H */
-videoSGI ::  videoSGI() : video("") { }
+videoSGI ::  videoSGI() : videoBase("") { }
 videoSGI :: ~videoSGI() { }
 #endif  /* !HAVE_VL_VL_H */

Modified: trunk/Gem/plugins/videoSGI/videoSGI.h
===================================================================
--- trunk/Gem/plugins/videoSGI/videoSGI.h       2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoSGI/videoSGI.h       2011-08-08 14:25:41 UTC (rev 
4433)
@@ -17,7 +17,7 @@
 #ifndef INCLUDE_VIDEOSGI_H_
 #define INCLUDE_VIDEOSGI_H_
 
-#include "plugins/video.h"
+#include "plugins/videoBase.h"
 
 #ifdef HAVE_VL_VL_H
 # include <vl/vl.h>
@@ -35,7 +35,7 @@
     
   -----------------------------------------------------------------*/
 namespace gem { namespace plugins {
- class GEM_EXPORT videoSGI : public video {
+ class GEM_EXPORT videoSGI : public videoBase {
   public:
     //////////
     // Constructor
@@ -43,7 +43,7 @@
                
     //////////
     // Destructor
-    virtual ~videoSGI();
+    virtual ~videoSGI(void);
 
 #ifdef HAVE_VL_VL_H
     ////////
@@ -54,11 +54,11 @@
     //////////
     // Start up the video device
     // [out] int - returns 0 if bad
-    bool               startTransfer();
+    bool               startTransfer(void);
     //////////
     // Stop the video device
     // [out] int - returns 0 if bad
-    bool               stopTransfer();
+    bool               stopTransfer(void);
 
     //////////
     // get the next frame

Modified: trunk/Gem/plugins/videoUNICAP/videoUNICAP.cpp
===================================================================
--- trunk/Gem/plugins/videoUNICAP/videoUNICAP.cpp       2011-08-08 14:24:10 UTC 
(rev 4432)
+++ trunk/Gem/plugins/videoUNICAP/videoUNICAP.cpp       2011-08-08 14:25:41 UTC 
(rev 4433)
@@ -81,7 +81,7 @@
 
 REGISTER_VIDEOFACTORY("unicap", videoUNICAP);
 
-videoUNICAP :: videoUNICAP() : video("unicap", 0)
+videoUNICAP :: videoUNICAP() : videoBase("unicap", 0)
                              , m_handle(NULL)
 {
   m_width=0; m_height=0;
@@ -602,6 +602,6 @@
 
 
 #else
-videoUNICAP ::  videoUNICAP() : video("") {}
+videoUNICAP ::  videoUNICAP() : videoBase("") {}
 videoUNICAP :: ~videoUNICAP() {}
 #endif /* HAVE_UNICAP */

Modified: trunk/Gem/plugins/videoUNICAP/videoUNICAP.h
===================================================================
--- trunk/Gem/plugins/videoUNICAP/videoUNICAP.h 2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoUNICAP/videoUNICAP.h 2011-08-08 14:25:41 UTC (rev 
4433)
@@ -15,7 +15,7 @@
 #ifndef INCLUDE_VIDEOUNICAP_H_
 #define INCLUDE_VIDEOUNICAP_H_
 
-#include "plugins/video.h"
+#include "plugins/videoBase.h"
 
 #if defined HAVE_LIBUNICAP && !defined HAVE_UNICAP
 # define HAVE_UNICAP
@@ -40,7 +40,7 @@
 
   -----------------------------------------------------------------*/
 namespace gem { namespace plugins {
- class GEM_EXPORT videoUNICAP : public video {
+ class GEM_EXPORT videoUNICAP : public videoBase {
  public:
   //////////
   // Constructor
@@ -48,7 +48,7 @@
   
   //////////
   // Destructor
-  virtual ~videoUNICAP();
+  virtual ~videoUNICAP(void);
   
 #ifdef HAVE_UNICAP
   ////////

Modified: trunk/Gem/plugins/videoV4L/videoV4L.cpp
===================================================================
--- trunk/Gem/plugins/videoV4L/videoV4L.cpp     2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoV4L/videoV4L.cpp     2011-08-08 14:25:41 UTC (rev 
4433)
@@ -83,7 +83,7 @@
 REGISTER_VIDEOFACTORY("v4l", videoV4L);
 
 
-videoV4L :: videoV4L() : video("v4l")
+videoV4L :: videoV4L() : videoBase("v4l")
                        ,
                          tvfd(0),
                          frame(0),

Modified: trunk/Gem/plugins/videoV4L/videoV4L.h
===================================================================
--- trunk/Gem/plugins/videoV4L/videoV4L.h       2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoV4L/videoV4L.h       2011-08-08 14:25:41 UTC (rev 
4433)
@@ -17,7 +17,7 @@
 #ifndef INCLUDE_VIDEOV4L_H_
 #define INCLUDE_VIDEOV4L_H_
 
-#include "plugins/video.h"
+#include "plugins/videoBase.h"
 
 #ifdef HAVE_LINUX_VIDEODEV_H
 # include <linux/videodev.h>
@@ -68,7 +68,7 @@
     
 -----------------------------------------------------------------*/
 namespace gem { namespace plugins {
- class GEM_EXPORT videoV4L : public video {
+ class GEM_EXPORT videoV4L : public videoBase {
     public:
         //////////
         // Constructor
@@ -76,7 +76,7 @@
                
        //////////
        // Destructor
-       virtual ~videoV4L();
+       virtual ~videoV4L(void);
 
        ////////
        // open the video-device
@@ -86,15 +86,15 @@
        //////////
        // Start up the video device
        // [out] int - returns 0 if bad
-       bool            startTransfer();
+       bool            startTransfer(void);
        //////////
        // Stop the video device
        // [out] int - returns 0 if bad
-       bool            stopTransfer();
+       bool            stopTransfer(void);
 
        //////////
        // get the next frame
-       bool grabFrame();
+       bool grabFrame(void);
 
        //////////
        // Set the video dimensions

Modified: trunk/Gem/plugins/videoV4L2/videoV4L2.cpp
===================================================================
--- trunk/Gem/plugins/videoV4L2/videoV4L2.cpp   2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoV4L2/videoV4L2.cpp   2011-08-08 14:25:41 UTC (rev 
4433)
@@ -74,7 +74,7 @@
 
 REGISTER_VIDEOFACTORY("v4l2", videoV4L2);
 
-videoV4L2 :: videoV4L2() : video("v4l2", 0)
+videoV4L2 :: videoV4L2() : videoBase("v4l2", 0)
                                    , m_gotFormat(0), m_colorConvert(0),
                                      m_tvfd(0),
                                      m_buffers(NULL), m_nbuffers(0), 
@@ -1123,6 +1123,6 @@
 
 
 #else
-videoV4L2 ::  videoV4L2() : video("") {}
+videoV4L2 ::  videoV4L2() : videoBase("") {}
 videoV4L2 :: ~videoV4L2() {}
 #endif /* HAVE_VIDEO4LINUX2 */

Modified: trunk/Gem/plugins/videoV4L2/videoV4L2.h
===================================================================
--- trunk/Gem/plugins/videoV4L2/videoV4L2.h     2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoV4L2/videoV4L2.h     2011-08-08 14:25:41 UTC (rev 
4433)
@@ -15,7 +15,7 @@
 #ifndef INCLUDE_VIDEOV4L2_H_
 #define INCLUDE_VIDEOV4L2_H_
 
-#include "plugins/video.h"
+#include "plugins/videoBase.h"
 
 #if defined HAVE_LIBV4L2 && !defined HAVE_VIDEO4LINUX2
 # define HAVE_VIDEO4LINUX2
@@ -83,7 +83,7 @@
     
   -----------------------------------------------------------------*/
 namespace gem { namespace plugins {
- class GEM_EXPORT videoV4L2 : public video {
+ class GEM_EXPORT videoV4L2 : public videoBase {
  public:
   //////////
   // Constructor
@@ -91,7 +91,7 @@
   
   //////////
   // Destructor
-  virtual ~videoV4L2();
+  virtual ~videoV4L2(void);
   
 #ifdef HAVE_VIDEO4LINUX2
   ////////
@@ -114,7 +114,7 @@
 
   //////////
   // get the next frame
-  virtual pixBlock    *getFrame();
+  virtual pixBlock    *getFrame(void);
 
 
   //////////

Modified: trunk/Gem/plugins/videoVFW/videoVFW.cpp
===================================================================
--- trunk/Gem/plugins/videoVFW/videoVFW.cpp     2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoVFW/videoVFW.cpp     2011-08-08 14:25:41 UTC (rev 
4433)
@@ -33,7 +33,7 @@
 //
 /////////////////////////////////////////////////////////
 videoVFW :: videoVFW()
-  : video("vfw", 0), 
+  : videoBase("vfw", 0), 
     m_hWndC(NULL)
 {
   provide("dv");
@@ -285,6 +285,6 @@
 }
 
 #else
-videoVFW ::  videoVFW() : video("") { }
+videoVFW ::  videoVFW() : videoBase("") { }
 videoVFW :: ~videoVFW() { }
 #endif

Modified: trunk/Gem/plugins/videoVFW/videoVFW.h
===================================================================
--- trunk/Gem/plugins/videoVFW/videoVFW.h       2011-08-08 14:24:10 UTC (rev 
4432)
+++ trunk/Gem/plugins/videoVFW/videoVFW.h       2011-08-08 14:25:41 UTC (rev 
4433)
@@ -15,7 +15,7 @@
 #ifndef INCLUDE_VIDEOVFW_H_
 #define INCLUDE_VIDEOVFW_H_
 
-#include "plugins/video.h"
+#include "plugins/videoBase.h"
 
 #ifdef HAVE_VFW_H
 # include <vfw.h>
@@ -33,7 +33,7 @@
     
   -----------------------------------------------------------------*/
 namespace gem { namespace plugins {
- class GEM_EXPORT videoVFW : public video {
+ class GEM_EXPORT videoVFW : public videoBase {
   public:
     //////////
     // Constructor
@@ -41,7 +41,7 @@
                
     //////////
     // Destructor
-    virtual ~videoVFW();
+    virtual ~videoVFW(void);
 
 #ifdef HAVE_VFW_H
     ////////
@@ -52,11 +52,11 @@
     //////////
     // Start up the video device
     // [out] int - returns 0 if bad
-    bool startTransfer();
+    bool startTransfer(void);
     //////////
     // Stop the video device
     // [out] int - returns 0 if bad
-    bool stopTransfer();
+    bool stopTransfer(void);
 
     //////////
     // get the next frame


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
BlackBerry&reg; DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts. 
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
pd-gem-CVS mailing list
pd-gem-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/pd-gem-cvs

Reply via email to