Commits

Anonymous committed a741f57

Merged with trubk rev 2393, and made some fixes in sound and movie
interaction.

Comments (0)

Files changed (7)

-include Setup.in *.py WHATSNEW readme.txt install.html
+include Setup.in Setup_Darwin.in Setup_Win_Common.in *.py WHATSNEW readme.txt install.html LGPL
+
 recursive-include docs *
 recursive-include lib *
 recursive-include src *
 releases. (hmm, until we get to versions > 10)
 """
 
-ver =   '1.9.0pre'
-vernum = 1,8,1
+ver =   '1.9.0rc1'
+vernum = 1,9,0
 <font size=+5><b>Pygame Readme</b></font>
 </td></tr><tr><td align=left width=33%><big>
 
-Version 1.9.0pre
+Version 1.9.0rc1
 
 
 </td><td align=center width=34%><big>
 
    Pygame Readme
-   Version 1.9.0pre Python Game Development
+   Version 1.9.0rc1 Python Game Development
    Originally by Pete Shinners, now an open source community project.
    http://www.pygame.org
-   pete@shinners.org
+   pygame@seul.org
 
    About
 
      Numeric package for its multidimensional numeric arrays.
 
    Todo / Ideas (feel free to submit)
-     * transform.skew() function
-     * transform.scroll() function
-     * image filtering (colors,blurs,etc)
-     * quake-like console with python interpreter
-     * game lobby. client, simple server, and protocol
-     * surfarrays should be able to do RGBA along with RGB
-     * draw with transparancy
-     * draw large sets of primitives with a single call
-     * drawing offsets, perhaps as subsurfaces
-     * new scale2x, scale3x, and scale4x from hiend3d
-     * switch Numeric to numarray (see docs on how to do both)
-     * audio resampling
+       http://www.pygame.org/wiki/todo/
 
    License
 
 
 METADATA = {
     "name":             "pygame",
-    "version":          "1.9.0pre",
+    "version":          "1.9.0rc1",
     "license":          "LGPL",
     "url":              "http://www.pygame.org",
     "author":           "Pete Shinners, Rene Dudfield, Marcus von Appen, Bob Pendleton, others...",
     Py_INCREF( movie);
     RELEASEGIL
     int paused = movie->paused;
+    //SDL_LockMutex(movie->dest_mutex);
     movie->paused = !movie->paused;
     if (!movie->paused) 
     {
 		movie->frame_timer += (av_gettime() - movie->video_current_pts_time) / 1000000.0;
     }
     movie->last_paused=paused;
+    //SDL_UnlockMutex(movie->dest_mutex);
     GRABGIL
     Py_DECREF( movie);
 	RELEASEGIL
 	int co = 0;
 	for(;co<10;co++)
 	{
+		if (movie->paused) {
+        	pauseBuffer(movie->channel);
+            goto closing;
+        }
+        //check if the movie has ended
+		if(movie->stop)
+		{
+			stopBuffer(movie->channel);
+			goto closing;
+		}
 		//fill up the buffer
 		while(movie->audio_pkt_size > 0)
         {
         if (pkt->data)
             av_free_packet(pkt);
 
-        if (movie->paused) {
-        	pauseBuffer(movie->channel);
-            goto closing;
-        }
-        //check if the movie has ended
-		if(movie->stop)
-		{
-			stopBuffer(movie->channel);
-			goto closing;
-		}
+        
         /* read next packet */
         if (packet_queue_get(&movie->audioq, pkt, 1) < 0)
         {
     do {
     	
         if (movie->paused && !movie->videoq.abort_request) {
-            return 0;
+            if(movie->paused)
+	            return 0;
         }
         if (packet_queue_get(&movie->videoq, pkt, 0) <=0)
             break;
 }
 int pauseBuffer(int channel)
 {
-	if(!channel)
+	if(channel<=-1)
 		return 0;
 	int paused = Mix_Paused(channel);
 	if(paused)