Add playlist_CurrentId() to get the playlist item id from the currently playing item.

diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index 92737b0c82957a7352dd426bd7ae85d004094cea..0238e5d95d7d690f94fab84605db8371f70f861a 100644 (file)
--- a/include/vlc/deprecated.h
+++ b/include/vlc/deprecated.h
@@ -127,6 +127,8 @@ VLC_DEPRECATED_API int libvlc_playlist_isplaying( libvlc_instance_t *,
 VLC_DEPRECATED_API int libvlc_playlist_items_count( libvlc_instance_t *,
                                                 libvlc_exception_t * );
 
+VLC_DEPRECATED_API int libvlc_playlist_get_current_index( libvlc_instance_t *,
+                                                 libvlc_exception_t *);
 /**
  * Lock the playlist.
  *

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 1dcd245b6fc76b833e7b6bf9e4ff117c0d71c3f7..4983b0b697d92312b534248999eaf648e5c82fd5 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -420,6 +420,9 @@ static inline int playlist_Import( playlist_t *p_playlist, const char *psz_file)
 /** Tell the number of items in the current playing context */
 #define playlist_CurrentSize( pl ) pl->current.i_size
 
+/** Tell the current item id in current  playing context */
+#define playlist_CurrentId( pl ) pl->status.p_item->i_id
+
 /** Ask the playlist to do some work */
 #define playlist_Signal( p_playlist ) vlc_object_signal( p_playlist )
 

diff --git a/projects/activex/vlccontrol.cpp b/projects/activex/vlccontrol.cpp
index 19210148ab6d58e4522ad67a8b6ce27d09f72c70..45347f7d6b5452d22aa9eb6b27e4d8b8ae546928 100644 (file)
--- a/projects/activex/vlccontrol.cpp
+++ b/projects/activex/vlccontrol.cpp
@@ -890,21 +890,28 @@ STDMETHODIMP VLCControl::addTarget(BSTR uri, VARIANT options, enum VLCPlaylistMo
 
 STDMETHODIMP VLCControl::get_PlaylistIndex(int *index)
 {
-    return E_INVALIDARG;
-#if 0
     if( NULL == index )
         return E_POINTER;
 
+    *index = 0;
     libvlc_instance_t *p_libvlc;
     HRESULT result = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(result) )
     {
-        *index = VLC_PlaylistIndex(i_vlc);
+        libvlc_exception_t ex;
+        libvlc_exception_init(&ex);
+
+        *index = libvlc_playlist_get_current_index(p_libvlc, &ex);
+        if( libvlc_exception_raised(&ex) )
+        {
+            _p_instance->setErrorInfo(IID_IVLCControl,
+                libvlc_exception_get_message(&ex));
+            libvlc_exception_clear(&ex);
+            return E_FAIL;
+        }
         return NOERROR;
     }
-    *index = 0;
     return result;
-#endif
 };
 
 STDMETHODIMP VLCControl::get_PlaylistCount(int *count)

diff --git a/src/control/playlist.c b/src/control/playlist.c
index ae9217fa543cdf82bd87790ac8f2c5ebc1f22db7..0300243df04cac24202a5028e2a369cc53beeb57 100644 (file)
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -62,7 +62,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
                            int i_options, char **ppsz_options,
                            libvlc_exception_t *p_e )
 {
-    VLC_UNUSED(p_e);
+    VLC_UNUSED(p_e); VLC_UNUSED(i_options); VLC_UNUSED(ppsz_options);
 
     int did_lock = 0;
     assert( PL );
@@ -208,6 +208,17 @@ int libvlc_playlist_items_count( libvlc_instance_t *p_instance,
     return playlist_CurrentSize( PL );
 }
 
+int libvlc_playlist_get_current_index ( libvlc_instance_t *p_instance,
+                                        libvlc_exception_t *p_e )
+{
+    VLC_UNUSED(p_e);
+
+    assert( PL );
+    if( !PL->status.p_item )
+        return -1;
+    return playlist_CurrentId( PL );
+}
+
 void libvlc_playlist_lock( libvlc_instance_t *p_instance )
 {
     assert( PL );

diff --git a/src/libvlc.sym b/src/libvlc.sym
index 1e7743027dc1d706163a014036277f56ac1dfef1..f3b8eb15d729fdbe3a0056e493137dc470bbfc34 100644 (file)
--- a/src/libvlc.sym
+++ b/src/libvlc.sym
@@ -148,6 +148,7 @@ libvlc_playlist_delete_item
 libvlc_playlist_get_media_player
 libvlc_playlist_isplaying
 libvlc_playlist_items_count
+libvlc_playlist_get_current_index
 libvlc_playlist_lock
 libvlc_playlist_loop
 libvlc_playlist_next