Changeset 36aca393c55082aab87d0564e225305da24e6e52

Timestamp:

14/09/08 10:14:24 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1221380064 +0300

git-parent:

[872779fbce6fe19c7d66d845c709e99defcbffbb]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1221380064 +0300

Message:

Remove intf_ShouldDie

libvlc kills the interfaces when it dies anyway.

Files:

• include/vlc_interface.h (modified) (1 diff)
• modules/control/gestures.c (modified) (2 diffs)
• modules/control/lirc.c (modified) (1 diff)
• modules/control/netsync.c (modified) (1 diff)
• modules/control/rc.c (modified) (3 diffs)
• modules/control/showintf.c (modified) (2 diffs)
• modules/gui/beos/Interface.cpp (modified) (1 diff)
• modules/gui/fbosd.c (modified) (1 diff)
• modules/gui/ncurses.c (modified) (1 diff)
• modules/gui/pda/pda.c (modified) (3 diffs)
• modules/gui/qt4/main_interface.cpp (modified) (1 diff)
• modules/gui/wince/timer.cpp (modified) (2 diffs)
• modules/gui/wxwidgets/timer.cpp (modified) (1 diff)

include/vlc_interface.h

@@ -109 +109 @@
-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 * ) );

modules/control/gestures.c

@@ -183 +183 @@
-
-    /* Main loop */
-!intf_ShouldDi
+vlc_object_aliv
-    {
-        vlc_mutex_lock( &p_intf->change_lock );
@@ -462 +462 @@
-    char *psz_button;
-    /* we might need some locking here */
-!intf_ShouldDi
+vlc_object_aliv
-    {
-        /* p_intf->change_lock locking strategy:

modules/control/lirc.c

@@ -176 +176 @@
-            return 0;
-
-!intf_ShouldDi
+vlc_object_aliv
-                && (lirc_code2char( p_intf->p_sys->config, code, &c ) == 0)
-                && (c != NULL) )

modules/control/netsync.c

@@ -151 +151 @@
-    vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_INPUT );
-
-!intf_ShouldDi
+vlc_object_aliv
-    {
-        /* Update the input */

modules/control/rc.c

@@ -480 +480 @@
-#endif
-
-!intf_ShouldDi
+vlc_object_aliv
-    {
-        char *psz_cmd, *psz_arg;
@@ -2051 +2051 @@
-                                INTF_IDLE_SLEEP/1000 ) == WAIT_OBJECT_0 )
-    {
-!intf_ShouldDi
+vlc_object_aliv
-               ReadConsoleInput( p_intf->p_sys->hConsoleIn, &input_record,
-                                 1, &i_dw ) )
@@ -2121 +2121 @@
-#endif
-
-!intf_ShouldDi
+vlc_object_aliv
-           (i_read = net_Read( p_intf, p_intf->p_sys->i_socket == -1 ?
-                       0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket, NULL,

modules/control/showintf.c

@@ -122 +122 @@
-
-    /* Main loop */
-!intf_ShouldDi
+vlc_object_aliv
-    {
-        vlc_mutex_lock( &p_intf->change_lock );
@@ -180 +180 @@
-static int InitThread( intf_thread_t * p_intf )
-{
-!intf_ShouldDi
+vlc_object_aliv
-    {
-        vlc_mutex_lock( &p_intf->change_lock );

modules/gui/beos/Interface.cpp

@@ -121 +121 @@
-static void Run( intf_thread_t *p_intf )
-{
-!intf_ShouldDi
+vlc_object_aliv
-    {
-        p_intf->p_sys->p_window->UpdateInterface();

modules/gui/fbosd.c

@@ -1273 +1273 @@
-    int canc = vlc_savecancel();
-
-!intf_ShouldDi
+vlc_object_aliv
-    {
-        int i;

modules/gui/ncurses.c

@@ -405 +405 @@
-    var_AddCallback( p_playlist, "item-change", PlaylistChanged, p_intf );
-
-!intf_ShouldDi
+vlc_object_aliv
-    {
-        msleep( INTF_IDLE_SLEEP );

modules/gui/pda/pda.c

@@ -318 +318 @@
-#ifdef NEED_GTK2_MAIN
-    msg_Dbg( p_intf, "Manage GTK keyboard events using threads" );
-!intf_ShouldDi
+vlc_object_aliv
-    {
-        Manage( p_intf );
@@ -517 +517 @@
-        vlc_object_unlock( p_input );
-    }
-!intf_ShouldDi
+vlc_object_aliv
-    {
-        GtkModeManage( p_intf );
@@ -524 +524 @@
-
-#ifndef NEED_GTK2_MAIN
-intf_ShouldDi
+!vlc_object_aliv
-    {
-        vlc_mutex_unlock( &p_intf->change_lock );

modules/gui/qt4/main_interface.cpp

@@ -925 +925 @@
-{
-    /* No event for dying */
-intf_ShouldDi
+!vlc_object_aliv
-    {
-        QApplication::closeAllWindows();

modules/gui/wince/timer.cpp

@@ -211 +211 @@
-        }
-    }
-!intf_ShouldDi
+vlc_object_aliv
-    {
-        p_intf->p_sys->b_playing = 0;
@@ -218 +218 @@
-    }
-
-intf_ShouldDi
+!vlc_object_aliv
-    {
-        vlc_mutex_unlock( &p_intf->change_lock );

modules/gui/wxwidgets/timer.cpp

@@ -97 +97 @@
-    }
-
-intf_ShouldDi
+!vlc_object_aliv
-    {
-        vlc_mutex_unlock( &p_intf->change_lock );