Remove unused variable.

[vlc] / include / vlc_interface.h

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index f5585f642944564ba8156ad9485270398339e812..8564a7b2232a1c5dd0efa833f7971f6610d7e997 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -23,10 +23,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
 #ifndef _VLC_INTF_H_
 #define _VLC_INTF_H_
 
@@ -54,7 +50,6 @@ struct intf_thread_t
     VLC_COMMON_MEMBERS
 
     /* Thread properties and locks */
-    bool          b_play;
     bool          b_should_run_on_first_thread;
 
     /* Specific interfaces */
@@ -116,11 +111,10 @@ struct intf_dialog_args_t
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-#define intf_Create(a,b,c,d) __intf_Create(VLC_OBJECT(a),b,c,d)
-VLC_EXPORT( intf_thread_t *, __intf_Create,     ( vlc_object_t *, const char *, int, const char *const * ) );
+#define intf_Create(a,b) __intf_Create(VLC_OBJECT(a),b)
+VLC_EXPORT( intf_thread_t *, __intf_Create,     ( vlc_object_t *, const char * ) );
 VLC_EXPORT( int,               intf_RunThread,  ( intf_thread_t * ) );
 VLC_EXPORT( void,              intf_StopThread, ( intf_thread_t * ) );
-VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
 
 /* If the interface is in the main thread, it should listen both to
  * p_intf->b_die and p_libvlc->b_die */
@@ -154,36 +148,36 @@ VLC_EXPORT( int, __intf_Eject, ( vlc_object_t *, const char * ) );
 
 /* Interface dialog ids for dialog providers */
 typedef enum vlc_dialog {
-       INTF_DIALOG_FILE_SIMPLE = 1,
-       INTF_DIALOG_FILE,
-       INTF_DIALOG_DISC,
-       INTF_DIALOG_NET,
-       INTF_DIALOG_CAPTURE,
-       INTF_DIALOG_SAT,
-       INTF_DIALOG_DIRECTORY,
-
-       INTF_DIALOG_STREAMWIZARD,
-       INTF_DIALOG_WIZARD,
-
-       INTF_DIALOG_PLAYLIST,
-       INTF_DIALOG_MESSAGES,
-       INTF_DIALOG_FILEINFO,
-       INTF_DIALOG_PREFS,
-       INTF_DIALOG_BOOKMARKS,
-       INTF_DIALOG_EXTENDED,
-
-       INTF_DIALOG_POPUPMENU = 20,
-       INTF_DIALOG_AUDIOPOPUPMENU,
-       INTF_DIALOG_VIDEOPOPUPMENU,
-       INTF_DIALOG_MISCPOPUPMENU,
-
-       INTF_DIALOG_FILE_GENERIC = 30,
-       INTF_DIALOG_INTERACTION = 50,
-
-       INTF_DIALOG_UPDATEVLC = 90,
-       INTF_DIALOG_VLM,
-
-       INTF_DIALOG_EXIT = 99
+    INTF_DIALOG_FILE_SIMPLE = 1,
+    INTF_DIALOG_FILE,
+    INTF_DIALOG_DISC,
+    INTF_DIALOG_NET,
+    INTF_DIALOG_CAPTURE,
+    INTF_DIALOG_SAT,
+    INTF_DIALOG_DIRECTORY,
+
+    INTF_DIALOG_STREAMWIZARD,
+    INTF_DIALOG_WIZARD,
+
+    INTF_DIALOG_PLAYLIST,
+    INTF_DIALOG_MESSAGES,
+    INTF_DIALOG_FILEINFO,
+    INTF_DIALOG_PREFS,
+    INTF_DIALOG_BOOKMARKS,
+    INTF_DIALOG_EXTENDED,
+
+    INTF_DIALOG_POPUPMENU = 20,
+    INTF_DIALOG_AUDIOPOPUPMENU,
+    INTF_DIALOG_VIDEOPOPUPMENU,
+    INTF_DIALOG_MISCPOPUPMENU,
+
+    INTF_DIALOG_FILE_GENERIC = 30,
+    INTF_DIALOG_INTERACTION = 50,
+
+    INTF_DIALOG_UPDATEVLC = 90,
+    INTF_DIALOG_VLM,
+
+    INTF_DIALOG_EXIT = 99
 } vlc_dialog_t;
 
 /* Useful text messages shared by interfaces */
@@ -202,7 +196,8 @@ typedef enum vlc_dialog {
 #define EXTENSIONS_MEDIA EXTENSIONS_VIDEO ";" EXTENSIONS_AUDIO ";" \
                           EXTENSIONS_PLAYLIST
 
-#define EXTENSIONS_SUBTITLE "*.cdg;*.idx;*.srt;*.sub;*.utf"
+#define EXTENSIONS_SUBTITLE "*.cdg;*.idx;*.srt;*.sub;*.utf;*.ass;*.ssa;*.aqt;" \
+                            "*.jss;*.psb;*.rt;*.smi"
 
 /** \defgroup vlc_interaction Interaction
  * \ingroup vlc_interface
@@ -241,6 +236,7 @@ struct interaction_dialog_t
     vlc_object_t   *p_parent;           ///< The vlc object that asked
                                         //for interaction
 };
+
 /**
  * Possible flags . Dialog types
  */
@@ -310,9 +306,9 @@ struct interaction_t
  ***************************************************************************/
 
 #define intf_UserFatal( a, b, c, d, e... ) __intf_UserFatal( VLC_OBJECT(a),b,c,d, ## e )
-VLC_EXPORT( int, __intf_UserFatal,( vlc_object_t*, bool, const char*, const char*, ...) ATTRIBUTE_FORMAT( 4, 5 ) );
+VLC_EXPORT( int, __intf_UserFatal,( vlc_object_t*, bool, const char*, const char*, ...) LIBVLC_FORMAT( 4, 5 ) );
 #define intf_UserWarn( a, c, d, e... ) __intf_UserWarn( VLC_OBJECT(a),c,d, ## e )
-VLC_EXPORT( int, __intf_UserWarn,( vlc_object_t*, const char*, const char*, ...) ATTRIBUTE_FORMAT( 3, 4 ) );
+VLC_EXPORT( int, __intf_UserWarn,( vlc_object_t*, const char*, const char*, ...) LIBVLC_FORMAT( 3, 4 ) );
 #define intf_UserLoginPassword( a, b, c, d, e... ) __intf_UserLoginPassword( VLC_OBJECT(a),b,c,d,e)
 VLC_EXPORT( int, __intf_UserLoginPassword,( vlc_object_t*, const char*, const char*, char **, char **) );
 #define intf_UserYesNo( a, b, c, d, e, f ) __intf_UserYesNo( VLC_OBJECT(a),b,c, d, e, f )