[vlc-commits] playlist: move playlist controls to vlc_playlist.h

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec 14 18:59:54 2014 +0200| [8d2c4eacf208619729112b35869faa1e85793385] | committer: Rémi Denis-Courmont

playlist: move playlist controls to vlc_playlist.h

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8d2c4eacf208619729112b35869faa1e85793385
---

 include/vlc_common.h   |   14 --------------
 include/vlc_playlist.h |   11 ++++++++++-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 367c091..b82deda 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -202,20 +202,6 @@ typedef struct date_t date_t;
 
 /* Playlist */
 
-/* FIXME */
-/**
- * Playlist commands
- */
-typedef enum {
-    PLAYLIST_PLAY,      /**< No arg.                            res=can fail*/
-    PLAYLIST_VIEWPLAY,  /**< arg1= playlist_item_t*,*/
-                        /**  arg2 = playlist_item_t*          , res=can fail */
-    PLAYLIST_PAUSE,     /**< No arg                             res=can fail*/
-    PLAYLIST_STOP,      /**< No arg                             res=can fail*/
-    PLAYLIST_SKIP,      /**< arg1=int,                          res=can fail*/
-} playlist_command_t;
-
-
 typedef struct playlist_t playlist_t;
 typedef struct playlist_item_t playlist_item_t;
 typedef struct services_discovery_t services_discovery_t;
diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 384221b..947ac99 100644
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -253,7 +253,16 @@ enum pl_locked_state
 #define PL_UNLOCK playlist_Unlock( p_playlist )
 #define PL_ASSERT_LOCKED playlist_AssertLocked( p_playlist )
 
-/* Playlist control */
+/** Playlist commands */
+enum {
+    PLAYLIST_PLAY,      /**< No arg.                            res=can fail*/
+    PLAYLIST_VIEWPLAY,  /**< arg1= playlist_item_t*,*/
+                        /**  arg2 = playlist_item_t*          , res=can fail */
+    PLAYLIST_PAUSE,     /**< No arg                             res=can fail*/
+    PLAYLIST_STOP,      /**< No arg                             res=can fail*/
+    PLAYLIST_SKIP,      /**< arg1=int,                          res=can fail*/
+};
+
 #define playlist_Play(p) playlist_Control(p,PLAYLIST_PLAY, pl_Unlocked )
 #define playlist_Pause(p) playlist_Control(p,PLAYLIST_PAUSE, pl_Unlocked )
 #define playlist_Stop(p) playlist_Control(p,PLAYLIST_STOP, pl_Unlocked )