X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_interface.h;h=ca1c5646b318f4bff1b852db87098d4ff05ee3aa;hb=f3398a2741095ee9b5f2951c260bed8eaab111d8;hp=b10e37424551b50ccccf07ede8806d85cdc64dab;hpb=5e7d42f71adcbc81c539b2e511e799a59b868d84;p=vlc

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index b10e374245..ca1c5646b3 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -106,45 +106,14 @@ static inline playlist_t *pl_Get( struct intf_thread_t *intf )
 #define pl_CurrentInput(intf) (playlist_CurrentInput(pl_Get(intf)))
 
 /**
- * \defgroup vlc_subscription Log messages subscription
- * These functions deal with log messages.
+ * @ingroup messages
  * @{
  */
 
-/**
- * Message logging callback signature.
- * \param data data pointer as provided to vlc_msg_SetCallback().
- * \param type message type (VLC_MSG_* values from enum vlc_log_type)
- * \param item meta information
- * \param fmt format string
- * \param args format string arguments
- */
-typedef void (*vlc_log_cb) (void *data, int type, const vlc_log_t *item,
-                            const char *fmt, va_list args);
-
 VLC_API void vlc_LogSet(libvlc_int_t *, vlc_log_cb cb, void *data);
 
 /*@}*/
 
-#if defined( _WIN32 ) && !VLC_WINSTORE_APP
-#    define CONSOLE_INTRO_MSG \
-         if( !getenv( "PWD" ) ) /* detect Cygwin shell or Wine */ \
-         { \
-         AllocConsole(); \
-         freopen( "CONOUT$", "w", stdout ); \
-         freopen( "CONOUT$", "w", stderr ); \
-         freopen( "CONIN$", "r", stdin ); \
-         } \
-         msg_Info( p_intf, "VLC media player - %s", VERSION_MESSAGE ); \
-         msg_Info( p_intf, "%s", COPYRIGHT_MESSAGE ); \
-         msg_Info( p_intf, _("\nWarning: if you cannot access the GUI " \
-                             "anymore, open a command-line window, go to the " \
-                             "directory where you installed VLC and run " \
-                             "\"vlc -I qt\"\n") )
-#else
-#    define CONSOLE_INTRO_MSG (void)0
-#endif
-
 /* Interface dialog ids for dialog providers */
 typedef enum vlc_dialog {
     INTF_DIALOG_FILE_SIMPLE = 1,
@@ -186,7 +155,7 @@ typedef enum vlc_dialog {
 #define EXTENSIONS_AUDIO_CSV "3ga", "669", "a52", "aac", "ac3", "adt", "adts", "aif", "aifc", "aiff", \
                          "amr", "aob", "ape", "au", "awb", "caf", "dts", "flac", "it", "kar", \
                          "m4a", "m4b", "m4p", "m5p", "mka", "mlp", "mod", "mpa", "mp1", "mp2", "mp3", "mpc", "mpga", "mus", \
-                         "oga", "ogg", "oma", "opus", "qcp", "ra", "rmi", "s3m", "sid", "spx", "thd", "tta", \
+                         "oga", "ogg", "oma", "opus", "qcp", "ra", "rmi", "s3m", "sid", "spx", "tak", "thd", "tta", \
                          "voc", "vqf", "w64", "wav", "wma", "wv", "xa", "xm"
 
 #define EXTENSIONS_VIDEO_CSV "3g2", "3gp", "3gp2", "3gpp", "amv", "asf", "avi", "bik", "divx", "drc", "dv", \
@@ -244,6 +213,7 @@ typedef enum vlc_dialog {
     "*.s3m;" \
     "*.sid;" \
     "*.spx;" \
+    "*.tak;" \
     "*.thd;" \
     "*.tta;" \
     "*.voc;" \