libvlcpp: fix compilation.

[vlc] / bindings / libvlcpp / src / video.cpp

diff --git a/bindings/libvlcpp/src/video.cpp b/bindings/libvlcpp/src/video.cpp
index 14e23b7a0bb36efb243d0bf637b4268d19a7b86b..58cc3cfd2f9bc1d07c81a7dbf2569972c35213b9 100644 (file)
--- a/bindings/libvlcpp/src/video.cpp
+++ b/bindings/libvlcpp/src/video.cpp
@@ -21,6 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <cstdlib>
 #include "video.hpp"
 #include "exception.hpp"
 
@@ -40,38 +41,32 @@ Video::~Video()
 
 float Video::scale()
 {
-    Exception ex;
-    return libvlc_video_get_scale( m_player, &ex.ex );
+    return libvlc_video_get_scale( m_player );
 }
 
 char *Video::aspectRatio()
 {
-    Exception ex;
-    return libvlc_video_get_aspect_ratio( m_player, &ex.ex );
+    return libvlc_video_get_aspect_ratio( m_player );
 }
 
 void Video::setAspectRatio( const char *aspect_ratio )
 {
-    Exception ex;
-    libvlc_video_set_aspect_ratio( m_player, aspect_ratio, &ex.ex );
+    libvlc_video_set_aspect_ratio( m_player, aspect_ratio );
 }
 
 int Video::spu()
 {
-    Exception ex;
-    return libvlc_video_get_spu( m_player, &ex.ex );
+    return libvlc_video_get_spu( m_player );
 }
 
 int Video::spuCount()
 {
-    Exception ex;
-    return libvlc_video_get_spu_count( m_player, &ex.ex );
+    return libvlc_video_get_spu_count( m_player );
 }
 
 void Video::setSpu( int spu )
 {
-    Exception ex;
-    libvlc_video_set_spu( m_player, spu, &ex.ex );
+    libvlc_video_set_spu( m_player, spu );
 }
 
 void Video::setSubtitleFile( const char *subtitle_file )
@@ -81,20 +76,17 @@ void Video::setSubtitleFile( const char *subtitle_file )
 
 char *Video::cropGeometry()
 {
-    Exception ex;
-    return libvlc_video_get_crop_geometry( m_player, &ex.ex );
+    return libvlc_video_get_crop_geometry( m_player );
 }
 
 void Video::setCropGeometry( const char *geometry )
 {
-    Exception ex;
-    libvlc_video_set_crop_geometry( m_player, geometry, &ex.ex );
+    libvlc_video_set_crop_geometry( m_player, geometry );
 }
 
 int Video::track()
 {
-    Exception ex;
-    return libvlc_video_get_track( m_player, &ex.ex );
+    return libvlc_video_get_track( m_player );
 }
 
 int Video::trackCount()
@@ -104,18 +96,18 @@ int Video::trackCount()
 
 void Video::setTrack( int track )
 {
-    Exception ex;
-    libvlc_video_set_track( m_player, track, &ex.ex );
+    libvlc_video_set_track( m_player, track );
 }
 
-void Video::snapshot( const char *filepath, int with, int height )
+int Video::snapshot( int num, const char *filepath, int with, int height )
 {
-    Exception ex;
-    libvlc_video_take_snapshot( m_player, filepath, with, height, &ex.ex );
+    return libvlc_video_take_snapshot( m_player, num, filepath, with, height );
 }
 
 void Video::deinterlace( int enable, const char *mode )
 {
-    Exception ex;
-    libvlc_video_set_deinterlace( m_player, enable, mode, &ex.ex );
+    if( enable )
+        libvlc_video_set_deinterlace( m_player, mode );
+    else
+        libvlc_video_set_deinterlace( m_player, NULL );
 }