From: Colin Guthrie <cguthrie@mandriva.org>
Date: Mon, 25 Jan 2010 01:11:18 +0000 (+0000)
Subject: phonon: Follow 2c57cb and remove exceptions in calls.
X-Git-Tag: 1.1.0-ff~921
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=320641ea29771765672e6f2dc67ab84d76a7e0bb;p=vlc

phonon: Follow 2c57cb and remove exceptions in calls.
(cherry picked from commit 80048bbcbf55c63290f3b2f6b1f04ce2f6b8d9f9)

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---

diff --git a/bindings/phonon/vlc/vlcmediaobject.cpp b/bindings/phonon/vlc/vlcmediaobject.cpp
index 4e06f358f8..31a3965385 100644
--- a/bindings/phonon/vlc/vlcmediaobject.cpp
+++ b/bindings/phonon/vlc/vlcmediaobject.cpp
@@ -57,7 +57,7 @@ VLCMediaObject::~VLCMediaObject()
 {
     unloadMedia();
 
-    libvlc_media_player_stop(p_vlc_media_player, vlc_exception); // ensure that we are stopped
+    libvlc_media_player_stop(p_vlc_media_player); // ensure that we are stopped
     libvlc_media_player_release(p_vlc_media_player);
 }
 
@@ -83,8 +83,7 @@ void VLCMediaObject::loadMediaInternal(const QString & filename)
     vlcExceptionRaised();
 
     // Set the media that will be used by the media player
-    libvlc_media_player_set_media(p_vlc_media_player, p_vlc_media, vlc_exception);
-    vlcExceptionRaised();
+    libvlc_media_player_set_media(p_vlc_media_player, p_vlc_media);
 
     // No need to keep the media now
 //    libvlc_media_release(p_vlc_media);
@@ -119,13 +118,12 @@ void VLCMediaObject::setVLCWidgetId()
 {
     // Get our media player to use our window
 #if defined(Q_OS_UNIX)
-    libvlc_media_player_set_xwindow(p_vlc_media_player, i_video_widget_id, vlc_exception);
+    libvlc_media_player_set_xwindow(p_vlc_media_player, i_video_widget_id);
 #elif defined(Q_OS_WIN)
-    libvlc_media_player_set_hwnd(p_vlc_media_player, i_video_widget_id, vlc_exception);
+    libvlc_media_player_set_hwnd(p_vlc_media_player, i_video_widget_id);
 #elif defined(Q_OS_MAC)
-    libvlc_media_player_set_agl(p_vlc_media_player, i_video_widget_id, vlc_exception);
+    libvlc_media_player_set_agl(p_vlc_media_player, i_video_widget_id);
 #endif
-    vlcExceptionRaised();
 }
 
 void VLCMediaObject::playInternal()
@@ -152,8 +150,7 @@ void VLCMediaObject::pause()
 
 void VLCMediaObject::stop()
 {
-    libvlc_media_player_stop(p_vlc_media_player, vlc_exception);
-    vlcExceptionRaised();
+    libvlc_media_player_stop(p_vlc_media_player);
 //    unloadMedia();
 }
 
@@ -182,7 +179,7 @@ bool VLCMediaObject::isSeekable() const
 void VLCMediaObject::connectToAllVLCEvents()
 {
     // Get the event manager from which the media player send event
-    p_vlc_media_player_event_manager = libvlc_media_player_event_manager(p_vlc_media_player, vlc_exception);
+    p_vlc_media_player_event_manager = libvlc_media_player_event_manager(p_vlc_media_player);
     libvlc_event_type_t eventsMediaPlayer[] = {
         libvlc_MediaPlayerPlaying,
         libvlc_MediaPlayerPaused,