diff options
| author | Minh Ngo <nlminhtl@gmail.com> | 2013-08-05 23:27:40 +0300 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-08-21 10:54:50 +0100 |
| commit | 619b848b66fd6e9825655cb6e9734c58e54fbe83 (patch) | |
| tree | c32a3f1c6368dfaf030ba000fca6072a5b629961 /avmedia | |
| parent | 5ae5a11f2ffbdb65da94e7ec1d54779603bfedb6 (diff) | |
Upd the instance API
Change-Id: Iba79d423336f9914ded8a121ba8f99f52c16466f
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/vlc/vlcplayer.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/vlc/wrapper/Instance.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/vlc/wrapper/Instance.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index 20ed327bf6bb..bcfc04f8cf79 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -36,7 +36,7 @@ namespace VLCPlayer::VLCPlayer( const rtl::OUString& url ) : VLC_Base(m_aMutex) - , mInstance( sizeof( VLC_ARGS ) / sizeof( VLC_ARGS[0] ), VLC_ARGS ) + , mInstance( VLC_ARGS ) , mMedia( InitMedia( url, mInstance ), libvlc_media_release ) , mPlayer( libvlc_media_player_new_from_media( mMedia.get() ), libvlc_media_player_release ) , mUrl( url ) diff --git a/avmedia/source/vlc/wrapper/Instance.cxx b/avmedia/source/vlc/wrapper/Instance.cxx index bc23167210b6..a150fefe620a 100644 --- a/avmedia/source/vlc/wrapper/Instance.cxx +++ b/avmedia/source/vlc/wrapper/Instance.cxx @@ -17,11 +17,11 @@ namespace VLC }; } - Instance::Instance( int argc, const char * const *argv ) + Instance::Instance( const char * const argv[] ) { InitApiMap( VLC_INSTANCE_API ); - mInstance = libvlc_new( argc, argv ); + mInstance = libvlc_new( sizeof( argv ) / sizeof( argv[0] ), argv ); } Instance::~Instance() diff --git a/avmedia/source/vlc/wrapper/Instance.hxx b/avmedia/source/vlc/wrapper/Instance.hxx index 0cad70558b54..8358a942c8e6 100644 --- a/avmedia/source/vlc/wrapper/Instance.hxx +++ b/avmedia/source/vlc/wrapper/Instance.hxx @@ -26,7 +26,7 @@ namespace VLC class Instance { public: - Instance( int argc, const char * const *argv ); + Instance( const char * const argv[] ); virtual ~Instance(); inline operator libvlc_instance_t*() |