[patch] Patch for locked mutex problem with mplayerplug-in under NPTL systems

mplayerplug-in-cvs.patch (text/plain), 1.42 KB, created by Mike Auty (RETIRED) on 2004-06-18 14:23:22 UTC

diff -uNr mplayerplug-in.orig/Source/plugin-threads.cpp mplayerplug-in/Source/plugin-threads.cpp
--- mplayerplug-in.orig/Source/plugin-threads.cpp	2004-06-18 22:13:36.576117224 +0100
+++ mplayerplug-in/Source/plugin-threads.cpp	2004-06-18 22:07:05.236609872 +0100
@@ -1028,6 +1028,7 @@
     int i;
     Node *node;
 
+    int nothing_on_list;
     int tryagain;
     int usefps;
     int nomouseinput;
@@ -1175,26 +1176,32 @@
 	    }
 	}
 
+	nothing_on_list = 0;
 	local_td->instance->currentnode = local_list;
 	if (local_list == NULL) {
 	    if (DEBUG)
 		printf("----player thread: nothing on the list to play\n");
-	    break;
-	}
-	//we have a node to play
-	if (DEBUG) {
-	    printf("----player thread: chose url %s\n", local_list->url);
+	    nothing_on_list = 1;
 	}
+	else { 
+	    //we have a node to play
+	    if (DEBUG) {
+	        printf("----player thread: chose url %s\n", local_list->url);
+	    }
 
-	snprintf(local_url, 1024, "%s", local_list->url);
-	local_url[1023] = '\0';
-	local_mmsstream = local_list->mmsstream;
+	    snprintf(local_url, 1024, "%s", local_list->url);
+	    local_url[1023] = '\0';
+	    local_mmsstream = local_list->mmsstream;
+	}
 
 	pthread_mutex_unlock(&(local_td->instance->playlist_mutex));
 	pthread_cleanup_pop(0);
 
 	pthread_testcancel();
 
+	// Make sure to exit after unlocking the mutex, once we're sure the list is empty.
+	if (nothing_on_list)
+		break;
 
 	usefps = 0;
 	nomouseinput = 0;