ActiveX: fix compilation

13bfe4cc · Jean-Baptiste Kempf · 181466ef · 13bfe4cc · 13bfe4cc
Commit 13bfe4cc authored Jan 29, 2010 by Jean-Baptiste Kempf
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

projects/activex/plugin.cpp projects/activex/plugin.cpp +1 -6

projects/activex/plugin.h projects/activex/plugin.h +1 -1

No files found.
--- a/projects/activex/plugin.cpp
+++ b/projects/activex/plugin.cpp
@@ -493,12 +493,7 @@ void VLCPlugin::initVLC()
    if( libvlc_exception_raised(&ex) )
        return;

-    _p_mlist = libvlc_media_list_new(_p_libvlc, &ex);
-    if( libvlc_exception_raised(&ex) )
-    {
-        libvlc_release(_p_libvlc);
-        return;
-    }
+    _p_mlist = libvlc_media_list_new(_p_libvlc);

    // initial volume setting
    libvlc_audio_set_volume(_p_libvlc, _i_volume, NULL);

--- a/projects/activex/plugin.h
+++ b/projects/activex/plugin.h
@@ -260,7 +260,7 @@ public:
            return;
        if( _p_mlist )
            libvlc_media_list_release(_p_mlist);
-        _p_mlist = libvlc_media_list_new(_p_libvlc,ex);
+        _p_mlist = libvlc_media_list_new(_p_libvlc);
    }
    int  playlist_count(libvlc_exception_t *ex)
    {