Changeset 2b5eb3185ecd05444ce310ec33e0fdc0e5e69c90

Timestamp:

05/07/08 20:37:29 (2 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210185449 +0300

git-parent:

[77bea3492049ad6989b04779d259fa27ed72a2e9]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210185449 +0300

Message:

Don't reregister the same callbacks over and over again

Files:

• modules/gui/ncurses.c (modified) (7 diffs)

modules/gui/ncurses.c

@@ -109 +109 @@
-
-static void start_color_and_pairs ( intf_thread_t * );
+static playlist_t *pl_Get( intf_thread_t *p_intf )
+{
+    return p_intf->p_sys->p_playlist;
+}
-
-/*****************************************************************************
@@ -181 +185 @@
-{
-    input_thread_t *p_input;
+    playlist_t     *p_playlist;
-
-    bool      b_color;
@@ -336 +341 @@
-    intf_thread_t *p_intf = (intf_thread_t *)p_this;
-    intf_sys_t    *p_sys = p_intf->p_sys;
-    playlist_t    *p_playlist = pl_Get( p_intf );
-    int i;
-
-    var_DelCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
-    var_DelCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
-
-    PlaylistDestroy( p_intf );
@@ -385 +386 @@
-    intf_sys_t    *p_sys = p_intf->p_sys;
-    playlist_t    *p_playlist = pl_Yield( p_intf );
+    p_sys->p_playlist = p_playlist;
-
-    int i_key;
@@ -397 +399 @@
-     */
-    PlaylistRebuild( p_intf );
+    var_AddCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
+    var_AddCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
-
-    while( !intf_ShouldDie( p_intf ) )
@@ -403 +407 @@
-
-        /* Update the input */
-        var_AddCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
-        var_AddCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
-
-        PL_LOCK;
-        if( p_sys->p_input == NULL )
@@ -459 +460 @@
-        }
-    }
+    var_DelCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
+    var_DelCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
-}
-