macosx: Fix controller playlist toggling to use the contentRect and not the window...

[vlc] / modules / control / ntservice.c

diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c
index 952d06b834739758c2cd05b2b37f6467c8f69567..52aa47c1ac58483f90bab2af55d918ad77f6c03b 100644 (file)
--- a/modules/control/ntservice.c
+++ b/modules/control/ntservice.c
@@ -28,7 +28,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_interface.h>
 
 #define VLCSERVICENAME "VLC media player"
@@ -61,8 +62,8 @@ static void Close   ( vlc_object_t * );
     "(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,
@@ -163,7 +164,7 @@ static void Run( intf_thread_t *p_intf )
         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) */
@@ -318,7 +319,7 @@ static void WINAPI ServiceDispatch( DWORD numArgs, char **args )
             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",
@@ -331,7 +332,7 @@ static void WINAPI ServiceDispatch( DWORD numArgs, char **args )
             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 );
             }