/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void Manager( intf_thread_t *p_intf );
static void RunInterface( intf_thread_t *p_intf );
static int SwitchIntfCallback( vlc_object_t *, char const *,
vlc_value_t , vlc_value_t , void * );
#ifdef __APPLE__
+static void Manager( intf_thread_t *p_intf );
/*****************************************************************************
* VLCApplication interface
*****************************************************************************/
@interface VLCApplication : NSApplication
{
- vlc_t *o_vlc;
+ libvlc_int_t *o_libvlc;
}
-- (void)setVLC: (vlc_t *)p_vlc;
+- (void)setVLC: (libvlc_int_t *)p_libvlc;
@end
#endif
* You can give some additional options to be used for interface initialization
*
* \param p_this the calling vlc_object_t
- * \param psz_module a prefered interface module
+ * \param psz_module a preferred interface module
* \param i_options number additional options
* \param ppsz_options additional option strings
* \return a pointer to the created interface thread, NULL on error
*/
intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module,
- int i_options, char **ppsz_options )
+ int i_options, const char *const *ppsz_options )
{
intf_thread_t * p_intf;
int i;
}
/* Choose the best module */
- p_intf->p_module = module_Need( p_intf, "interface", psz_module, 0 );
+ p_intf->p_module = module_Need( p_intf, "interface", psz_module, VLC_FALSE );
if( p_intf->p_module == NULL )
{
}
}
- if( p_intf->b_block && strncmp( p_intf->p_vlc->psz_object_name,
+ if( p_intf->b_block && strncmp( p_intf->p_libvlc->psz_object_name,
"clivlc", 6) )
{
o_pool = [[NSAutoreleasePool alloc] init];
[VLCApplication sharedApplication];
- [NSApp setVLC: p_intf->p_vlc];
+ [NSApp setVLC: p_intf->p_libvlc];
}
if( p_intf->b_block &&
( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) ||
- !strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) )
+ !strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6 ) ) )
{
/* VLC in normal primary interface mode */
RunInterface( p_intf );
}
else
{
+ /* This interface doesn't need to be run */
+ if( !p_intf->pf_run )
+ return VLC_SUCCESS;
+
/* Run the interface in a separate thread */
if( !strcmp( p_intf->p_module->psz_object_name, "macosx" ) )
{
#else
if( p_intf->b_block )
{
- /* Run a manager thread, launch the interface, kill the manager */
- if( vlc_thread_create( p_intf, "manager", Manager,
- VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+ /* If the main interface does not have a run function,
+ * implement a waiting loop ourselves
+ */
+ if( p_intf->pf_run )
+ RunInterface( p_intf );
+ else
{
- msg_Err( p_intf, "cannot spawn manager thread" );
- return VLC_EGENERIC;
+ while( !intf_ShouldDie( p_intf ) )
+ msleep( INTF_IDLE_SLEEP * 2);
}
-
- RunInterface( p_intf );
-
p_intf->b_die = VLC_TRUE;
/* Do not join the thread... intf_StopThread will do it for us */
}
else
{
+ /* This interface doesn't need to be run */
+ if( !p_intf->pf_run )
+ return VLC_SUCCESS;
+
/* Run the interface in a separate thread */
if( vlc_thread_create( p_intf, "interface", RunInterface,
VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
if( !p_intf->b_block )
{
p_intf->b_die = VLC_TRUE;
+ if( p_intf->pf_run )
+ {
+ vlc_cond_signal( &p_intf->object_wait );
+ vlc_thread_join( p_intf );
+ }
}
-
- /* Wait for the thread to exit */
- vlc_thread_join( p_intf );
}
/**
/* Following functions are local */
/*****************************************************************************
- * Manager: helper thread for blocking interfaces
- *****************************************************************************
- * If the interface is launched in the main thread, it will not listen to
- * p_vlc->b_die events because it is only supposed to listen to p_intf->b_die.
- * This thread takes care of the matter.
+ * Manager: helper thread for blocking OS X
*****************************************************************************/
-/**
- * \brief Helper thread for blocking interfaces.
- * \ingroup vlc_interface
- *
- * This is a local function
- * If the interface is launched in the main thread, it will not listen to
- * p_vlc->b_die events because it is only supposed to listen to p_intf->b_die.
- * This thread takes care of the matter.
- * \see intf_RunThread
- * \param p_intf an interface thread
- * \return nothing
- */
+#ifdef __APPLE__
static void Manager( intf_thread_t *p_intf )
{
while( !p_intf->b_die )
{
msleep( INTF_IDLE_SLEEP );
- if( p_intf->p_vlc->b_die )
+ if( p_intf->p_libvlc->b_die )
{
p_intf->b_die = VLC_TRUE;
-#ifdef __APPLE__
- if( strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) )
- {
- [NSApp stop: NULL];
- }
-#endif
+ if( strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6 ) )
+ {
+ [NSApp stop: NULL];
+ }
return;
}
}
}
+#endif
/*****************************************************************************
* RunInterface: setups necessary data and give control to the interface
*****************************************************************************/
static void RunInterface( intf_thread_t *p_intf )
{
- static char *ppsz_interfaces[] =
+ static const char *ppsz_interfaces[] =
{
"skins2", "Skins 2",
+#ifndef WIN32
"wxwidgets", "wxWidgets",
+#endif
NULL, NULL
};
- char **ppsz_parser;
+ const char **ppsz_parser;
vlc_list_t *p_list;
int i;
module_t *p_module = (module_t *)p_list->p_values[i].p_object;
if( !strcmp( p_module->psz_object_name, ppsz_parser[0] ) )
{
- val.psz_string = ppsz_parser[0];
- text.psz_string = ppsz_parser[1];
+ val.psz_string = (char *)ppsz_parser[0];
+ text.psz_string = (char *)_(ppsz_parser[1]);
var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE,
&val, &text );
break;
text.psz_string = _("Add Interface");
var_Change( p_intf, "intf-add", VLC_VAR_SETTEXT, &text, NULL );
- val.psz_string = "rc"; text.psz_string = "Console";
+ val.psz_string = (char *)"rc"; text.psz_string = (char *)"Console";
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "telnet"; text.psz_string = "Telnet Interface";
+ val.psz_string = (char *)"telnet";
+ text.psz_string = (char *)_("Telnet Interface");
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "http"; text.psz_string = "Web Interface";
+ val.psz_string = (char *)"http";
+ text.psz_string = (char *)_("Web Interface");
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "logger"; text.psz_string = "Debug logging";
+ val.psz_string = (char *)"logger";
+ text.psz_string = (char *)_("Debug logging");
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "gestures"; text.psz_string = "Mouse Gestures";
+ val.psz_string = (char *)"gestures";
+ text.psz_string = (char *)_("Mouse Gestures");
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL );
/* Try to create the interface */
sprintf( psz_intf, "%s,none", newval.psz_string );
- p_intf = intf_Create( p_this->p_vlc, psz_intf, 0, NULL );
+ p_intf = intf_Create( p_this->p_libvlc, psz_intf, 0, NULL );
free( psz_intf );
if( p_intf == NULL )
{
#ifdef __APPLE__
/*****************************************************************************
- * VLCApplication implementation
+ * VLCApplication implementation
*****************************************************************************/
-@implementation VLCApplication
+@implementation VLCApplication
-- (void)setVLC: (vlc_t *) p_vlc
+- (void)setVLC: (libvlc_int_t *) p_libvlc
{
- o_vlc = p_vlc;
+ o_libvlc = p_libvlc;
}
- (void)stop: (id)sender
- (void)terminate: (id)sender
{
- o_vlc->b_die = VLC_TRUE;
+ o_libvlc->b_die = VLC_TRUE;
}
@end
projects / vlc / blobdiff