* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#ifndef _VLC_INTF_H_
-#define _VLC_INTF_H_
+#ifndef VLC_INTF_H_
+#define VLC_INTF_H_
# ifdef __cplusplus
extern "C" {
VLC_COMMON_MEMBERS
/* Thread properties and locks */
+#if defined( __APPLE__ ) || defined( WIN32 )
bool b_should_run_on_first_thread;
+#endif
/* Specific interfaces */
intf_console_t * p_console; /** console */
/** Interaction stuff */
bool b_interaction;
- /** Video window callbacks */
- void * ( *pf_request_window ) ( intf_thread_t *, vout_thread_t *,
- int *, int *,
- unsigned int *, unsigned int * );
- void ( *pf_release_window ) ( intf_thread_t *, void * );
- int ( *pf_control_window ) ( intf_thread_t *, void *, int, va_list );
-
/* XXX: new message passing stuff will go here */
vlc_mutex_t change_lock;
bool b_menu_change;
bool b_menu;
-
- /* Provides the ability to switch an interface on the fly */
- char *psz_switch_intf;
};
/** \brief Arguments passed to a dialogs provider
VLC_EXPORT( int, intf_RunThread, ( intf_thread_t * ) );
VLC_EXPORT( void, intf_StopThread, ( 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 */
-#define intf_ShouldDie( p_intf ) (p_intf->b_die || p_intf->p_libvlc->b_die )
-
#define intf_Eject(a,b) __intf_Eject(VLC_OBJECT(a),b)
VLC_EXPORT( int, __intf_Eject, ( vlc_object_t *, const char * ) );
freopen( "CONOUT$", "w", stderr ); \
freopen( "CONIN$", "r", stdin ); \
} \
- msg_Info( p_intf, COPYRIGHT_MESSAGE ); \
+ msg_Info( p_intf, "%s", COPYRIGHT_MESSAGE ); \
msg_Info( p_intf, _("\nWarning: if you can't access the GUI " \
"anymore, open a command-line window, go to the " \
"directory where you installed VLC and run " \
- "\"vlc -I wx\"\n") )
+ "\"vlc -I qt\"\n") )
#else
# define CONSOLE_INTRO_MSG
#endif
#define INTF_ABOUT_MSG LICENSE_MSG
#define EXTENSIONS_AUDIO "*.a52;*.aac;*.ac3;*.dts;*.flac;*.m4a;*.m4p;*.mka;" \
- "*.mod;*.mp1;*.mp2;*.mp3;*.ogg;*.spx;*.wav;*.wma;*.xm"
+ "*.mod;*.mp1;*.mp2;*.mp3;*.oga;*.ogg;*.oma;*.spx;" \
+ "*.wav;*.wma;*.xm"
#define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.m1v;*.m2v;" \
- "*.m4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \
- "*.mpeg2;*.mpeg4;*.mpg;*.mxf;*.ogg;*.ogm;" \
+ "*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \
+ "*.mpeg2;*.mpeg4;*.mpg;*.mts;*.mxf;*.nuv;" \
+ "*.ogg;*.ogm;*.ogv;*.ogx;" \
"*.ps;*.ts;*.vob;*.wmv"
#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.m3u;*.pls;*.vlc;*.xspf"