Commit 829df829 authored by Rémi Duraffort's avatar Rémi Duraffort

libvlcpp: fix compilation.

parent c1626d91
......@@ -22,7 +22,6 @@
*****************************************************************************/
#include "media_player.hpp"
#include "exception.hpp"
using namespace libvlc;
......@@ -222,24 +221,20 @@ void MediaPlayer::nextFrame()
void MediaPlayer::toggleFullscreen()
{
Exception ex;
libvlc_toggle_fullscreen( m_player, &ex.ex );
libvlc_toggle_fullscreen( m_player );
}
void MediaPlayer::enableFullscreen()
{
Exception ex;
libvlc_set_fullscreen( m_player, 1, &ex.ex );
libvlc_set_fullscreen( m_player, 1 );
}
void MediaPlayer::disableFullscreen()
{
Exception ex;
libvlc_set_fullscreen( m_player, 0, &ex.ex );
libvlc_set_fullscreen( m_player, 0 );
}
int MediaPlayer::fullscreen()
{
Exception ex;
return libvlc_get_fullscreen( m_player, &ex.ex );
return libvlc_get_fullscreen( m_player );
}
......@@ -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 );
}
......@@ -145,11 +145,13 @@ public:
/**
* Take a snapshot and save it to a file
* @param num: the video output id (0 for the first/only one)
* @param filepath: path where to save the file
* @param widht: widht of the snapshot
* @param height: height of the snapshot
* @return 0 on success, -1 if the video output was not found
*/
void snapshot( const char *filepath, int widht, int height );
int snapshot( int num, const char *filepath, int widht, int height );
/**
* Enable or disable deinterlace filter and select the deinterlace filter to use
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment