[vlc-devel] commit: Update the NEWS and the dialogs for the subtitles support. ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon May 12 08:03:20 2008 -0700| [b474765b049da00ea24aceb9f49eaeefb22da7a3]

Update the NEWS and the dialogs for the subtitles support.

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

 NEWS                    |   11 ++++++-
 include/vlc_interface.h |   64 ++++++++++++++++++++++++----------------------
 2 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/NEWS b/NEWS
index 71c4394..3299fb8 100644
--- a/NEWS
+++ b/NEWS
@@ -84,8 +84,6 @@ Input/Demuxers:
 
 Decoders:
  * VP60/VP61/VP6F/VP62 support
- * MKV USF subtitles support
- * HTML-based subtitles support
  * Flash Screen Video support
  * CamStudio Screen Video support
  * DosBox Capture support
@@ -100,7 +98,16 @@ Decoders:
  * NellyMoser ASAO support
  * APE (Monkey audio) support
  * VBI & EBU (Teletext) support
+
+Subtitles:
  * Ogg/Kate subtitles support
+ * AQTitle subtitles support
+ * MKV USF subtitles support
+ * HTML-based subtitles support
+ * MPSub subtitles support
+ * JacoSub subtitles basic support
+ * MPL2 subtitles support
+ * Rewrite of ASS/SSA scripts and subtitles support.
 
 Encoders:
  * Flash Screen Video support
diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index f5585f6..ec0aedf 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -154,36 +154,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 +202,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"
 
 /** \defgroup vlc_interaction Interaction
  * \ingroup vlc_interface
@@ -241,6 +242,7 @@ struct interaction_dialog_t
     vlc_object_t   *p_parent;           ///< The vlc object that asked
                                         //for interaction
 };
+
 /**
  * Possible flags . Dialog types
  */