Removed unneeded macros.

[vlc] / modules / demux / playlist / playlist.h

diff --git a/modules/demux/playlist/playlist.h b/modules/demux/playlist/playlist.h
index 49c1612556d5384cb188d9821000c244c7036081..bfa0666db72ae0ad5567af805b749106c9ec15bc 100644 (file)
--- a/modules/demux/playlist/playlist.h
+++ b/modules/demux/playlist/playlist.h
@@ -21,68 +21,86 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc_playlist.h>
-char *E_(ProcessMRL)( char *, char * );
-char *E_(FindPrefix)( demux_t * );
+#include <vlc_input.h>
 
-vlc_bool_t E_(FindItem)( demux_t *, playlist_t *, playlist_item_t **);
+char *ProcessMRL( char *, char * );
+char *FindPrefix( demux_t * );
 
-void E_(AddToPlaylist)( demux_t *, playlist_t*,input_item_t*,playlist_item_t*,int );
+int Import_Old ( vlc_object_t * );
 
-int E_(Import_Old) ( vlc_object_t * );
+int Import_Native ( vlc_object_t * );
+void Close_Native ( vlc_object_t * );
 
-int E_(Import_Native) ( vlc_object_t * );
-void E_(Close_Native) ( vlc_object_t * );
+int Import_M3U ( vlc_object_t * );
+void Close_M3U ( vlc_object_t * );
 
-int E_(Import_M3U) ( vlc_object_t * );
-void E_(Close_M3U) ( vlc_object_t * );
+int Import_PLS ( vlc_object_t * );
+void Close_PLS ( vlc_object_t * );
 
-int E_(Import_PLS) ( vlc_object_t * );
-void E_(Close_PLS) ( vlc_object_t * );
+int Import_B4S ( vlc_object_t * );
+void Close_B4S ( vlc_object_t * );
 
-int E_(Import_B4S) ( vlc_object_t * );
-void E_(Close_B4S) ( vlc_object_t * );
+int Import_DVB ( vlc_object_t * );
+void Close_DVB ( vlc_object_t * );
 
-int E_(Import_DVB) ( vlc_object_t * );
-void E_(Close_DVB) ( vlc_object_t * );
+int Import_podcast ( vlc_object_t * );
+void Close_podcast ( vlc_object_t * );
 
-int E_(Import_podcast) ( vlc_object_t * );
-void E_(Close_podcast) ( vlc_object_t * );
+int Import_xspf ( vlc_object_t * );
+void Close_xspf ( vlc_object_t * );
 
-int E_(Import_xspf) ( vlc_object_t * );
-void E_(Close_xspf) ( vlc_object_t * );
+int Import_Shoutcast ( vlc_object_t * );
+void Close_Shoutcast ( vlc_object_t * );
 
-int E_(Import_Shoutcast) ( vlc_object_t * );
-void E_(Close_Shoutcast) ( vlc_object_t * );
+int Import_ASX ( vlc_object_t * );
+void Close_ASX ( vlc_object_t * );
 
-int E_(Import_ASX) ( vlc_object_t * );
-void E_(Close_ASX) ( vlc_object_t * );
+int Import_SGIMB ( vlc_object_t * );
+void Close_SGIMB ( vlc_object_t * );
 
-int E_(Import_SGIMB) ( vlc_object_t * );
-void E_(Close_SGIMB) ( vlc_object_t * );
+int Import_QTL ( vlc_object_t * );
+void Close_QTL ( vlc_object_t * );
 
-int E_(Import_QTL) ( vlc_object_t * );
-void E_(Close_QTL) ( vlc_object_t * );
+int Import_GVP ( vlc_object_t * );
+void Close_GVP ( vlc_object_t * );
 
-int E_(Import_GVP) ( vlc_object_t * );
-void E_(Close_GVP) ( vlc_object_t * );
+int Import_IFO ( vlc_object_t * );
+void Close_IFO ( vlc_object_t * );
+
+int Import_VideoPortal ( vlc_object_t * );
+void Close_VideoPortal ( vlc_object_t * );
+
+int Import_iTML ( vlc_object_t * );
+void Close_iTML ( vlc_object_t * );
 
 #define INIT_PLAYLIST_STUFF \
-    playlist_t *p_playlist = pl_Yield( p_demux ); \
-    vlc_bool_t b_play = var_CreateGetBool( p_demux, "playlist-autostart" ); \
-    input_item_t *p_current_input = ( (input_thread_t*)p_demux->p_parent)-> \
-                                                         input.p_item; \
-    playlist_item_t *p_current = \
-                 playlist_LockItemGetByInput( p_playlist, p_current_input ); \
-    playlist_item_t *p_item_in_category = \
-                            playlist_ItemToNode( p_playlist, p_current ); \
-    b_play = b_play && p_current == p_playlist->status.p_item; \
-    if( p_item_in_category ) \
-        p_item_in_category->p_input->i_type = ITEM_TYPE_PLAYLIST;
+    input_thread_t *p_input_thread = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT ); \
+    input_item_t *p_current_input = input_GetItem( p_input_thread );
 
 #define HANDLE_PLAY_AND_RELEASE \
-    /* Go back and play the playlist */ \
-    if( b_play && p_item_in_category && p_item_in_category->i_children > 0 ) \
-        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, p_item_in_category, \
-                          NULL ); \
-    vlc_object_release( p_playlist );
+    vlc_object_release( p_input_thread );
+
+
+#define STANDARD_DEMUX_INIT_MSG( msg ) do { \
+    DEMUX_INIT_COMMON();                    \
+    msg_Dbg( p_demux, "%s", msg ); } while(0)
+
+#define DEMUX_BY_EXTENSION_MSG( ext, msg ) \
+    demux_t *p_demux = (demux_t *)p_this; \
+    if( !demux_IsPathExtension( p_demux, ext ) ) \
+        return VLC_EGENERIC; \
+    STANDARD_DEMUX_INIT_MSG( msg );
+
+#define DEMUX_BY_EXTENSION_OR_FORCED_MSG( ext, module, msg ) \
+    demux_t *p_demux = (demux_t *)p_this; \
+    if( !demux_IsPathExtension( p_demux, ext ) && !demux_IsForced( p_demux, module ) ) \
+        return VLC_EGENERIC; \
+    STANDARD_DEMUX_INIT_MSG( msg );
+
+
+#define CHECK_PEEK( zepeek, size ) do { \
+    if( stream_Peek( p_demux->s , &zepeek, size ) < size ){ \
+        msg_Dbg( p_demux, "not enough data" ); return VLC_EGENERIC; } } while(0)
+
+#define POKE( peek, stuff, size ) (strncasecmp( (const char *)peek, stuff, size )==0)
+