Revision: 4482
          http://pd-gem.svn.sourceforge.net/pd-gem/?rev=4482&view=rev
Author:   zmoelnig
Date:     2011-08-19 08:16:59 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
()->(void)

Modified Paths:
--------------
    trunk/Gem/plugins/videoDS/videoDS.cpp

Modified: trunk/Gem/plugins/videoDS/videoDS.cpp
===================================================================
--- trunk/Gem/plugins/videoDS/videoDS.cpp       2011-08-16 20:42:59 UTC (rev 
4481)
+++ trunk/Gem/plugins/videoDS/videoDS.cpp       2011-08-19 08:16:59 UTC (rev 
4482)
@@ -126,7 +126,7 @@
 // Destructor
 //
 /////////////////////////////////////////////////////////
-videoDS :: ~videoDS()
+videoDS :: ~videoDS(void)
 {
     // Clean up the movie
     close();
@@ -317,7 +317,7 @@
 // close message
 //
 /////////////////////////////////////////////////////////
-void videoDS :: closeDevice()
+void videoDS :: closeDevice(void)
 {
 #ifdef DIRECTSHOW_LOGGING
     m_pGB->SetLogFile(NULL);
@@ -357,7 +357,7 @@
 // enumerate message
 //
 /////////////////////////////////////////////////////////
-std::vector<std::string>videoDS :: enumerate()
+std::vector<std::string>videoDS :: enumerate(void)
 {
     std::vector<std::string>result;
 
@@ -432,7 +432,7 @@
 // render
 //
 /////////////////////////////////////////////////////////
-pixBlock* videoDS :: getFrame()
+pixBlock* videoDS :: getFrame(void)
 {
     // Copy the buffer from the camera buffer to the texture buffer
     copyBuffer();
@@ -443,16 +443,19 @@
         m_image.image.xsize=m_pixBlockBuf[m_readIdx].image.xsize;
         m_image.image.ysize=m_pixBlockBuf[m_readIdx].image.ysize;
         switch (m_pixBlockBuf[m_readIdx].image.format){
-    case GL_BGR_EXT:
-    default:
-        m_image.image.fromBGR(m_pixBlockBuf[m_readIdx].image.data);
+        case GL_BGR_EXT:
+        default:
+            m_image.image.fromBGR(m_pixBlockBuf[m_readIdx].image.data);
         }
+        m_image.newimage=true;
+
         return &m_image;
-    } else return NULL;
+    }
+    return NULL;
 }
 
 /* copies the image from DS into the current m_pixBlockBuf */
-void videoDS :: copyBuffer()
+void videoDS :: copyBuffer(void)
 {
     HRESULT    hr;
     long       SampleSize;     
@@ -510,7 +513,7 @@
 // postrender
 //
 /////////////////////////////////////////////////////////
-void videoDS :: releaseFrame()
+void videoDS :: releaseFrame(void)
 {
     if (!m_haveVideo || !m_capturing)return;
 
@@ -522,7 +525,7 @@
 // startTransfer
 //
 /////////////////////////////////////////////////////////
-bool videoDS :: startTransfer()
+bool videoDS :: startTransfer(void)
 {
     HRESULT hr;
 
@@ -556,7 +559,7 @@
 // stopTransfer
 //
 /////////////////////////////////////////////////////////
-bool videoDS :: stopTransfer()
+bool videoDS :: stopTransfer(void)
 {
     HRESULT hr;
     if (FAILED(hr = m_pMC->Stop())) {
@@ -659,7 +662,7 @@
 
 
 #ifdef USE_RECORDING
-void videoDS :: startCapture()
+void videoDS :: startCapture(void)
 {
     HRESULT    hr;
     WCHAR      WideFileName[MAXPDSTRING];
@@ -695,7 +698,7 @@
                     m_recording        = true;
     }
 }
-void videoDS :: stopCapture()
+void videoDS :: stopCapture(void)
 {
     HRESULT    RetVal;
 


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

------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system, 
user administration capabilities and model configuration. Take 
the hassle out of deploying and managing Subversion and the 
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
pd-gem-CVS mailing list
pd-gem-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/pd-gem-cvs

Reply via email to