forward port [17012] and make update-po

[vlc] / activex / vlccontrol2.cpp

diff --git a/activex/vlccontrol2.cpp b/activex/vlccontrol2.cpp
index 1007775cd1b875f4c93076d71ff902587075ddd8..de0b288ec2c54f7ecff18cc9f698ae948e6c32e2 100755 (executable)
--- a/activex/vlccontrol2.cpp
+++ b/activex/vlccontrol2.cpp
@@ -120,6 +120,7 @@ STDMETHODIMP VLCAudio::get_mute(VARIANT_BOOL* mute)
         *mute = libvlc_audio_get_mute(p_libvlc, &ex) ? VARIANT_TRUE : VARIANT_FALSE;
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -140,6 +141,7 @@ STDMETHODIMP VLCAudio::put_mute(VARIANT_BOOL mute)
         libvlc_audio_set_mute(p_libvlc, VARIANT_FALSE != mute, &ex);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -163,6 +165,7 @@ STDMETHODIMP VLCAudio::get_volume(int* volume)
         *volume = libvlc_audio_get_volume(p_libvlc, &ex);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -183,6 +186,7 @@ STDMETHODIMP VLCAudio::put_volume(int volume)
         libvlc_audio_set_volume(p_libvlc, volume, &ex);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -203,6 +207,7 @@ STDMETHODIMP VLCAudio::toggleMute()
         libvlc_audio_toggle_mute(p_libvlc, &ex);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -290,7 +295,7 @@ STDMETHODIMP VLCInput::Invoke(DISPID dispIdMember, REFIID riid,
     return E_NOTIMPL;
 };
 
-STDMETHODIMP VLCInput::get_length(__int64* length)
+STDMETHODIMP VLCInput::get_length(double* length)
 {
     if( NULL == length )
         return E_POINTER;
@@ -305,13 +310,14 @@ STDMETHODIMP VLCInput::get_length(__int64* length)
         libvlc_input_t *p_input = libvlc_playlist_get_input(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            *length = (__int64)libvlc_input_get_length(p_input, &ex);
+            *length = (double)libvlc_input_get_length(p_input, &ex);
             libvlc_input_free(p_input);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -340,6 +346,7 @@ STDMETHODIMP VLCInput::get_position(float* position)
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -365,13 +372,14 @@ STDMETHODIMP VLCInput::put_position(float position)
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
     return hr;
 };
 
-STDMETHODIMP VLCInput::get_time(__int64* time)
+STDMETHODIMP VLCInput::get_time(double* time)
 {
     if( NULL == time )
         return E_POINTER;
@@ -386,20 +394,21 @@ STDMETHODIMP VLCInput::get_time(__int64* time)
         libvlc_input_t *p_input = libvlc_playlist_get_input(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            *time = libvlc_input_get_time(p_input, &ex);
+            *time = (double)libvlc_input_get_time(p_input, &ex);
             libvlc_input_free(p_input);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
     return hr;
 };
 
-STDMETHODIMP VLCInput::put_time(__int64 time)
+STDMETHODIMP VLCInput::put_time(double time)
 {
     libvlc_instance_t* p_libvlc;
     HRESULT hr = _p_instance->getVLC(&p_libvlc);
@@ -411,13 +420,14 @@ STDMETHODIMP VLCInput::put_time(__int64 time)
         libvlc_input_t *p_input = libvlc_playlist_get_input(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            libvlc_input_set_time(p_input, time, &ex);
+            libvlc_input_set_time(p_input, (vlc_int64_t)time, &ex);
             libvlc_input_free(p_input);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -476,6 +486,7 @@ STDMETHODIMP VLCInput::get_rate(float* rate)
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -501,6 +512,7 @@ STDMETHODIMP VLCInput::put_rate(float rate)
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -529,6 +541,7 @@ STDMETHODIMP VLCInput::get_fps(float* fps)
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -557,6 +570,7 @@ STDMETHODIMP VLCInput::get_hasVout(VARIANT_BOOL* hasVout)
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -657,6 +671,8 @@ STDMETHODIMP VLCPlaylist::get_itemCount(int* count)
         *count = libvlc_playlist_items_count(p_libvlc, &ex);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCPlaylist,
+                libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -680,6 +696,8 @@ STDMETHODIMP VLCPlaylist::get_isPlaying(VARIANT_BOOL* isPlaying)
         *isPlaying = libvlc_playlist_isplaying(p_libvlc, &ex) ? VARIANT_TRUE: VARIANT_FALSE;
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCPlaylist,
+                libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -741,6 +759,8 @@ STDMETHODIMP VLCPlaylist::add(BSTR uri, VARIANT name, VARIANT options, int* item
             CoTaskMemFree(psz_name);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCPlaylist,
+                libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -781,6 +801,8 @@ STDMETHODIMP VLCPlaylist::playItem(int item)
         libvlc_playlist_play(p_libvlc, item, 0, NULL, &ex);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCPlaylist,
+                libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -801,6 +823,8 @@ STDMETHODIMP VLCPlaylist::togglePause()
         libvlc_playlist_pause(p_libvlc, &ex);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCPlaylist,
+                libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -821,6 +845,8 @@ STDMETHODIMP VLCPlaylist::stop()
         libvlc_playlist_stop(p_libvlc, &ex);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCPlaylist,
+                libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -841,6 +867,8 @@ STDMETHODIMP VLCPlaylist::next()
         libvlc_playlist_next(p_libvlc, &ex);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCPlaylist,
+                libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -861,6 +889,8 @@ STDMETHODIMP VLCPlaylist::prev()
         libvlc_playlist_prev(p_libvlc, &ex);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCPlaylist,
+                libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -881,6 +911,8 @@ STDMETHODIMP VLCPlaylist::clear()
         libvlc_playlist_clear(p_libvlc, &ex);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCPlaylist,
+                libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -901,6 +933,8 @@ STDMETHODIMP VLCPlaylist::removeItem(int item)
         libvlc_playlist_delete_item(p_libvlc, item, &ex);
         if( libvlc_exception_raised(&ex) )
         {
+            _p_instance->setErrorInfo(IID_IVLCPlaylist,
+                libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -1010,6 +1044,7 @@ STDMETHODIMP VLCVideo::get_fullscreen(VARIANT_BOOL* fullscreen)
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -1035,6 +1070,7 @@ STDMETHODIMP VLCVideo::put_fullscreen(VARIANT_BOOL fullscreen)
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -1063,6 +1099,7 @@ STDMETHODIMP VLCVideo::get_width(int* width)
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -1091,6 +1128,33 @@ STDMETHODIMP VLCVideo::get_height(int* height)
                 return NOERROR;
             }
         }
+        _p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
+        libvlc_exception_clear(&ex);
+        return E_FAIL;
+    }
+    return hr;
+};
+
+STDMETHODIMP VLCVideo::toggleFullscreen()
+{
+    libvlc_instance_t* p_libvlc;
+    HRESULT hr = _p_instance->getVLC(&p_libvlc);
+    if( SUCCEEDED(hr) )
+    {
+        libvlc_exception_t ex;
+        libvlc_exception_init(&ex);
+
+        libvlc_input_t *p_input = libvlc_playlist_get_input(p_libvlc, &ex);
+        if( ! libvlc_exception_raised(&ex) )
+        {
+            libvlc_toggle_fullscreen(p_input, &ex);
+            libvlc_input_free(p_input);
+            if( ! libvlc_exception_raised(&ex) )
+            {
+                return NOERROR;
+            }
+        }
+        _p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -1194,6 +1258,135 @@ STDMETHODIMP VLCControl2::Invoke(DISPID dispIdMember, REFIID riid,
     return E_NOTIMPL;
 };
 
+STDMETHODIMP VLCControl2::get_AutoLoop(VARIANT_BOOL *autoloop)
+{
+    if( NULL == autoloop )
+        return E_POINTER;
+
+    *autoloop = _p_instance->getAutoLoop() ? VARIANT_TRUE: VARIANT_FALSE;
+    return S_OK;
+};
+
+STDMETHODIMP VLCControl2::put_AutoLoop(VARIANT_BOOL autoloop)
+{
+    _p_instance->setAutoLoop((VARIANT_FALSE != autoloop) ? TRUE: FALSE);
+    return S_OK;
+};
+
+STDMETHODIMP VLCControl2::get_AutoPlay(VARIANT_BOOL *autoplay)
+{
+    if( NULL == autoplay )
+        return E_POINTER;
+
+    *autoplay = _p_instance->getAutoPlay() ? VARIANT_TRUE: VARIANT_FALSE;
+    return S_OK;
+};
+
+STDMETHODIMP VLCControl2::put_AutoPlay(VARIANT_BOOL autoplay)
+{
+    _p_instance->setAutoPlay((VARIANT_FALSE != autoplay) ? TRUE: FALSE);
+    return S_OK;
+};
+
+STDMETHODIMP VLCControl2::get_BaseURL(BSTR *url)
+{
+    if( NULL == url )
+        return E_POINTER;
+
+    *url = SysAllocStringLen(_p_instance->getBaseURL(),
+                SysStringLen(_p_instance->getBaseURL()));
+    return NOERROR;
+};
+
+STDMETHODIMP VLCControl2::put_BaseURL(BSTR mrl)
+{
+    _p_instance->setBaseURL(mrl);
+
+    return S_OK;
+};
+
+STDMETHODIMP VLCControl2::get_MRL(BSTR *mrl)
+{
+    if( NULL == mrl )
+        return E_POINTER;
+
+    *mrl = SysAllocStringLen(_p_instance->getMRL(),
+                SysStringLen(_p_instance->getMRL()));
+    return NOERROR;
+};
+
+STDMETHODIMP VLCControl2::put_MRL(BSTR mrl)
+{
+    _p_instance->setMRL(mrl);
+
+    return S_OK;
+};
+
+STDMETHODIMP VLCControl2::get_StartTime(int *seconds)
+{
+    if( NULL == seconds )
+        return E_POINTER;
+
+    *seconds = _p_instance->getStartTime();
+
+    return S_OK;
+};
+     
+STDMETHODIMP VLCControl2::put_StartTime(int seconds)
+{
+    _p_instance->setStartTime(seconds);
+
+    return NOERROR;
+};
+        
+STDMETHODIMP VLCControl2::get_VersionInfo(BSTR *version)
+{
+    if( NULL == version )
+        return E_POINTER;
+
+    const char *versionStr = VLC_Version();
+    if( NULL != versionStr )
+    {
+        *version = BSTRFromCStr(_p_instance->getCodePage(), versionStr);
+        
+        return NULL == *version ? E_OUTOFMEMORY : NOERROR;
+    }
+    *version = NULL;
+    return E_FAIL;
+};
+ 
+STDMETHODIMP VLCControl2::get_Visible(VARIANT_BOOL *isVisible)
+{
+    if( NULL == isVisible )
+        return E_POINTER;
+
+    *isVisible = _p_instance->getVisible() ? VARIANT_TRUE : VARIANT_FALSE;
+
+    return NOERROR;
+};
+        
+STDMETHODIMP VLCControl2::put_Visible(VARIANT_BOOL isVisible)
+{
+    _p_instance->setVisible(isVisible != VARIANT_FALSE);
+
+    return NOERROR;
+};
+
+STDMETHODIMP VLCControl2::get_Volume(int *volume)
+{
+    if( NULL == volume )
+        return E_POINTER;
+
+    *volume  = _p_instance->getVolume();
+    return NOERROR;
+};
+        
+STDMETHODIMP VLCControl2::put_Volume(int volume)
+{
+    _p_instance->setVolume(volume);
+    return NOERROR;
+};
+
 STDMETHODIMP VLCControl2::get_audio(IVLCAudio** obj)
 {
     if( NULL == obj )