/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
#define VLCSERVICENAME "VLC media player"
"(common values are: logger, sap, rc, http)")
vlc_module_begin();
- set_shortname( _("NT Service"));
- set_description( _("Windows Service interface") );
+ set_shortname( N_("NT Service"));
+ set_description( N_("Windows Service interface") );
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_CONTROL );
add_bool( "ntservice-install", 0, NULL,
- INSTALL_TEXT, INSTALL_LONGTEXT, VLC_TRUE );
+ INSTALL_TEXT, INSTALL_LONGTEXT, true );
add_bool( "ntservice-uninstall", 0, NULL,
- UNINSTALL_TEXT, UNINSTALL_LONGTEXT, VLC_TRUE );
+ UNINSTALL_TEXT, UNINSTALL_LONGTEXT, true );
add_string ( "ntservice-name", VLCSERVICENAME, NULL,
- NAME_TEXT, NAME_LONGTEXT, VLC_TRUE );
+ NAME_TEXT, NAME_LONGTEXT, true );
add_string ( "ntservice-options", NULL, NULL,
- OPTIONS_TEXT, OPTIONS_LONGTEXT, VLC_TRUE );
+ OPTIONS_TEXT, OPTIONS_LONGTEXT, true );
add_string ( "ntservice-extraintf", NULL, NULL,
- EXTRAINTF_TEXT, EXTRAINTF_LONGTEXT, VLC_TRUE );
+ EXTRAINTF_TEXT, EXTRAINTF_LONGTEXT, true );
set_capability( "interface", 0 );
set_callbacks( Activate, Close );
intf_StopThread( p_extraintf );
vlc_object_detach( p_extraintf );
vlc_object_release( p_extraintf );
- intf_Destroy( p_extraintf );
+ vlc_object_release( p_extraintf );
}
/* Make sure we exit (In case other interfaces have been spawned) */
strcat( psz_path, " --ntservice-extraintf " );
strcat( psz_path, psz_extra );
}
- if( psz_extra ) free( psz_extra );
+ free( psz_extra );
psz_extra = config_GetPsz( p_intf, "ntservice-options" );
if( psz_extra && *psz_extra )
strcat( psz_path, " " );
strcat( psz_path, psz_extra );
}
- if( psz_extra ) free( psz_extra );
+ free( psz_extra );
SC_HANDLE service =
CreateService( handle, p_sys->psz_service, p_sys->psz_service,
sprintf( psz_temp, "%s,none", psz_module );
/* Try to create the interface */
- p_new_intf = intf_Create( p_intf, psz_temp, 0, NULL );
+ p_new_intf = intf_Create( p_intf, psz_temp );
if( p_new_intf == NULL )
{
msg_Err( p_intf, "interface \"%s\" initialization failed",
}
/* Try to run the interface */
- p_new_intf->b_block = VLC_FALSE;
if( intf_RunThread( p_new_intf ) )
{
vlc_object_detach( p_new_intf );
- intf_Destroy( p_new_intf );
+ vlc_object_release( p_new_intf );
msg_Err( p_intf, "interface \"%s\" cannot run", psz_temp );
}
free( psz_temp );
}
}
- if( psz_modules )
- {
- free( psz_modules );
- }
+ free( psz_modules );
/* Initialization complete - report running status */
p_sys->status.dwCurrentState = SERVICE_RUNNING;