Changeset a15af1b90a7ee88f76a1f67c1fdd13efe885a564

Timestamp:

05/07/08 19:48:38 (3 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1215280118 +0200

git-parent:

[b0d34dd091e493f5c1cc4940ece339d4dda775bb]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1215279170 +0200

Message:

macosx: Make sure we don't leak an input_thread_t.

Files:

• modules/gui/macosx/intf.h (modified) (1 diff)
• modules/gui/macosx/intf.m (modified) (5 diffs)

modules/gui/macosx/intf.h

@@ -67 +67 @@
-{
-    NSAutoreleasePool * o_pool;
-
-    /* the current input */
-    input_thread_t * p_input;
-
-    /* special actions */

modules/gui/macosx/intf.m

@@ -1133 +1133 @@
-{
-    playlist_t * p_playlist;
+    input_thread_t * p_input = NULL;
-
-    /* new thread requires a new pool */
@@ -1154 +1155 @@
-        vlc_mutex_lock( &p_intf->change_lock );
-
-p_intf->p_sys->p_input == NULL
-
-tf->p_sys->p_in
+!p_input
+
+
-
-            /* Refresh the interface */
-tf->p_sys->p_in
+
-            {
-                msg_Dbg( p_intf, "input has changed, refreshing interface" );
@@ -1165 +1166 @@
-            }
-        }
-tf->p_sys->p_input) || p_intf->p_sys->
+put) || 
-        {
-            /* input stopped */
@@ -1171 +1172 @@
-            p_intf->p_sys->i_play_status = END_S;
-            msg_Dbg( p_intf, "input has stopped, refreshing interface" );
-tf->p_sys->p_in
-tf->p_sys->p_in
+
+
-        }
-
@@ -1184 +1185 @@
-    vlc_object_unlock( p_intf );
-    [o_pool release];
+
+    if( p_input ) vlc_object_release( p_input );
-
-    var_DelCallback( p_playlist, "playlist-current", PlaylistChanged, self );