X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=projects%2Factivex%2Fvlccontrol.cpp;h=541a90daef4816b59d5e1667073d8192140e1b2a;hb=6e57b286525d57db5741da6d0cd919da0e3c0cec;hp=266b46ce949b91002e4b40dcae37ed591f0b9552;hpb=ad77d955a5dc051976d94d6e08ee0f717ec3a938;p=vlc

diff --git a/projects/activex/vlccontrol.cpp b/projects/activex/vlccontrol.cpp
index 266b46ce94..541a90daef 100644
--- a/projects/activex/vlccontrol.cpp
+++ b/projects/activex/vlccontrol.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlccontrol.cpp: ActiveX control for VLC
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-2010 the VideoLAN team
  *
  * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
  *          Jean-Paul Saman <jpsaman@videolan.org>
@@ -112,26 +112,21 @@ STDMETHODIMP VLCControl::get_Visible(VARIANT_BOOL *isVisible)
 
     *isVisible = _p_instance->getVisible() ? VARIANT_TRUE : VARIANT_FALSE;
 
-    return NOERROR;
+    return S_OK;
 };
 
 STDMETHODIMP VLCControl::put_Visible(VARIANT_BOOL isVisible)
 {
     _p_instance->setVisible(isVisible != VARIANT_FALSE);
 
-    return NOERROR;
+    return S_OK;
 };
 
 STDMETHODIMP VLCControl::play(void)
 {
-    libvlc_exception_t ex;
-    libvlc_exception_init(&ex);
-
-    _p_instance->playlist_play(&ex);
-    HRESULT result = exception_bridge(&ex);
-    if( SUCCEEDED(result) )
-        _p_instance->fireOnPlayEvent();
-    return result;
+    _p_instance->playlist_play();
+    _p_instance->fireOnPlayEvent();
+    return S_OK;
 };
 
 STDMETHODIMP VLCControl::pause(void)
@@ -140,13 +135,8 @@ STDMETHODIMP VLCControl::pause(void)
     HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        libvlc_media_player_pause(p_md, &ex);
-        result = exception_bridge(&ex);
-        if( SUCCEEDED(result) )
-            _p_instance->fireOnPauseEvent();
+        libvlc_media_player_pause(p_md);
+        _p_instance->fireOnPauseEvent();
     }
     return result;
 };
@@ -157,13 +147,8 @@ STDMETHODIMP VLCControl::stop(void)
     HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        libvlc_media_player_stop(p_md, &ex);
-        result = exception_bridge(&ex);
-        if( SUCCEEDED(result) )
-            _p_instance->fireOnStopEvent();
+        libvlc_media_player_stop(p_md);
+        _p_instance->fireOnStopEvent();
     }
     return result;
 };
@@ -177,7 +162,7 @@ STDMETHODIMP VLCControl::get_Playing(VARIANT_BOOL *isPlaying)
     HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
     {
-        *isPlaying = libvlc_media_player_is_playing(p_md, NULL) ?
+        *isPlaying = libvlc_media_player_is_playing(p_md) ?
                      VARIANT_TRUE : VARIANT_FALSE;
     } else *isPlaying = VARIANT_FALSE;
     return result;
@@ -193,11 +178,7 @@ STDMETHODIMP VLCControl::get_Position(float *position)
     HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        *position = libvlc_media_player_get_position(p_md, &ex);
-        result = exception_bridge(&ex);
+        *position = libvlc_media_player_get_position(p_md);
     }
     return result;
 };
@@ -208,11 +189,7 @@ STDMETHODIMP VLCControl::put_Position(float position)
     HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        libvlc_media_player_set_position(p_md, position, &ex);
-        result = exception_bridge(&ex);
+        libvlc_media_player_set_position(p_md, position);
     }
     return result;
 };
@@ -227,11 +204,7 @@ STDMETHODIMP VLCControl::get_Time(int *seconds)
     HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        *seconds = libvlc_media_player_get_time(p_md, &ex);
-        result = exception_bridge(&ex);
+        *seconds = libvlc_media_player_get_time(p_md);
     }
     return result;
 };
@@ -240,7 +213,7 @@ STDMETHODIMP VLCControl::put_Time(int seconds)
 {
     /* setTime function of the plugin sets the time. */
     _p_instance->setTime(seconds);
-    return NOERROR;
+    return S_OK;
 };
 
 STDMETHODIMP VLCControl::shuttle(int seconds)
@@ -249,12 +222,8 @@ STDMETHODIMP VLCControl::shuttle(int seconds)
     HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
         if( seconds < 0 ) seconds = 0;
-        libvlc_media_player_set_time(p_md, (int64_t)seconds, &ex);
-        result = exception_bridge(&ex);
+        libvlc_media_player_set_time(p_md, (int64_t)seconds);
     }
     return result;
 
@@ -266,9 +235,9 @@ STDMETHODIMP VLCControl::fullscreen(void)
     HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
     {
-        if( libvlc_media_player_is_playing(p_md, NULL) )
+        if( libvlc_media_player_is_playing(p_md) )
         {
-            libvlc_toggle_fullscreen(p_md, NULL);
+            libvlc_toggle_fullscreen(p_md);
         }
     }
     return result;
@@ -284,11 +253,7 @@ STDMETHODIMP VLCControl::get_Length(int *seconds)
     HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        *seconds = (double)libvlc_media_player_get_length(p_md, &ex);
-        result = exception_bridge(&ex);
+        *seconds = (double)libvlc_media_player_get_length(p_md);
     }
     return result;
 
@@ -303,11 +268,7 @@ STDMETHODIMP VLCControl::playFaster(void)
 
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        libvlc_media_player_set_rate(p_md, rate, &ex);
-        result = exception_bridge(&ex);
+        libvlc_media_player_set_rate(p_md, rate);
     }
     return result;
 };
@@ -320,11 +281,7 @@ STDMETHODIMP VLCControl::playSlower(void)
     HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        libvlc_media_player_set_rate(p_md, rate, &ex);
-        result = exception_bridge(&ex);
+        libvlc_media_player_set_rate(p_md, rate);
     }
     return result;
 };
@@ -335,27 +292,21 @@ STDMETHODIMP VLCControl::get_Volume(int *volume)
         return E_POINTER;
 
     *volume  = _p_instance->getVolume();
-    return NOERROR;
+    return S_OK;
 };
 
 STDMETHODIMP VLCControl::put_Volume(int volume)
 {
     _p_instance->setVolume(volume);
-    return NOERROR;
+    return S_OK;
 };
 
 STDMETHODIMP VLCControl::toggleMute(void)
 {
-    libvlc_instance_t* p_libvlc;
-    HRESULT result = _p_instance->getVLC(&p_libvlc);
+    libvlc_media_player_t *p_md;
+    HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        libvlc_audio_toggle_mute(p_libvlc, &ex);
-        result = exception_bridge(&ex);
-    }
+        libvlc_audio_toggle_mute(p_md);
     return result;
 };
 
@@ -723,17 +674,13 @@ STDMETHODIMP VLCControl::addTarget(BSTR uri, VARIANT options, enum VLCPlaylistMo
         if( FAILED(CreateTargetOptions(CP_UTF8, &options, &cOptions, &cOptionsCount)) )
             return E_INVALIDARG;
 
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
         position = _p_instance->playlist_add_extended_untrusted(cUri,
-                       cOptionsCount, const_cast<const char**>(cOptions), &ex);
+                       cOptionsCount, const_cast<const char**>(cOptions));
 
         FreeTargetOptions(cOptions, cOptionsCount);
         CoTaskMemFree(cUri);
 
-        hr = exception_bridge(&ex);
-        if( SUCCEEDED(hr) )
+        if( position >= 0 )
         {
             if( mode & VLCPlayListAppendAndGo )
                 _p_instance->fireOnPlayEvent();
@@ -757,11 +704,7 @@ STDMETHODIMP VLCControl::get_PlaylistIndex(int *index)
     HRESULT result = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        *index = _p_instance->playlist_get_current_index(&ex);
-        result = exception_bridge(&ex);
+        *index = _p_instance->playlist_get_current_index();
     }
     return result;
 };
@@ -771,11 +714,8 @@ STDMETHODIMP VLCControl::get_PlaylistCount(int *count)
     if( NULL == count )
         return E_POINTER;
 
-    libvlc_exception_t ex;
-    libvlc_exception_init(&ex);
-
-    *count = _p_instance->playlist_count(&ex);
-    return exception_bridge(&ex);
+    *count = _p_instance->playlist_count();
+    return S_OK;
 };
 
 STDMETHODIMP VLCControl::playlistNext(void)
@@ -784,11 +724,7 @@ STDMETHODIMP VLCControl::playlistNext(void)
     HRESULT result = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        _p_instance->playlist_next(&ex);
-        result = exception_bridge(&ex);
+        _p_instance->playlist_next();
     }
     return result;
 };
@@ -799,11 +735,7 @@ STDMETHODIMP VLCControl::playlistPrev(void)
     HRESULT result = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        _p_instance->playlist_prev(&ex);
-        result = exception_bridge(&ex);
+        _p_instance->playlist_prev();
     }
     return result;
 };
@@ -814,11 +746,7 @@ STDMETHODIMP VLCControl::playlistClear(void)
     HRESULT result = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(result) )
     {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        _p_instance->playlist_clear(&ex);
-        result = exception_bridge(&ex);
+        _p_instance->playlist_clear();
     }
     return result;
 };
@@ -845,7 +773,7 @@ STDMETHODIMP VLCControl::get_MRL(BSTR *mrl)
 
     *mrl = SysAllocStringLen(_p_instance->getMRL(),
                 SysStringLen(_p_instance->getMRL()));
-    return NOERROR;
+    return S_OK;
 };
 
 STDMETHODIMP VLCControl::put_MRL(BSTR mrl)