X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bindings%2Flibvlcpp%2Fsrc%2Faudio.cpp;fp=bindings%2Flibvlcpp%2Fsrc%2Faudio.cpp;h=01bb812a0d807ffd72886cde05a1543c0f9e57e8;hb=0851b345b93451a2cd0c61f12680b055fbfef027;hp=e0fb46ffbe78578c8d0b80409120677be712cfa2;hpb=76beeb83a2f233c91d8322bffa2cfb1b04dab843;p=vlc

diff --git a/bindings/libvlcpp/src/audio.cpp b/bindings/libvlcpp/src/audio.cpp
index e0fb46ffbe..01bb812a0d 100644
--- a/bindings/libvlcpp/src/audio.cpp
+++ b/bindings/libvlcpp/src/audio.cpp
@@ -22,16 +22,12 @@
  *****************************************************************************/
 
 #include "audio.hpp"
-#include "exception.hpp"
 
 
 using namespace libvlc;
 
-Audio::Audio( libvlc_instance_t *libvlcInstance, libvlc_media_player_t *player )
+Audio::Audio( libvlc_media_player_t *player )
 {
-    m_libvlcInstance = libvlcInstance;
-    libvlc_retain( m_libvlcInstance );
-
     m_player = player;
     libvlc_media_player_retain( m_player );
 }
@@ -39,50 +35,45 @@ Audio::Audio( libvlc_instance_t *libvlcInstance, libvlc_media_player_t *player )
 Audio::~Audio()
 {
     libvlc_media_player_release( m_player );
-    libvlc_release( m_libvlcInstance );
 }
 
 void Audio::toggleMute()
 {
-    libvlc_audio_toggle_mute( m_libvlcInstance );
+    libvlc_audio_toggle_mute( m_player );
 }
 
 int Audio::mute()
 {
-    return libvlc_audio_get_mute( m_libvlcInstance );
+    return libvlc_audio_get_mute( m_player );
 }
 
 void Audio::setMute( int mute )
 {
-    libvlc_audio_set_mute( m_libvlcInstance, mute );
+    libvlc_audio_set_mute( m_player, mute );
 }
 
 int Audio::volume()
 {
-    return libvlc_audio_get_volume( m_libvlcInstance );
+    return libvlc_audio_get_volume( m_player );
 }
 
 void Audio::setVolume( int volume )
 {
-    Exception ex;
-    libvlc_audio_set_volume( m_libvlcInstance, volume, &ex.ex );
+    libvlc_audio_set_volume( m_player, volume );
 }
 
 int Audio::track()
 {
-    Exception ex;
-    return libvlc_audio_get_track( m_player, &ex.ex );
+    return libvlc_audio_get_track( m_player );
 }
 
 int Audio::trackCount()
 {
-    Exception ex;
-    return libvlc_audio_get_track_count( m_player, &ex.ex );
+    return libvlc_audio_get_track_count( m_player );
 }
 
 void Audio::setTrack( int track )
 {
-    Exception ex;
-    libvlc_audio_set_track( m_player, track, &ex.ex );
+    libvlc_audio_set_track( m_player, track );
 }