[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38632] branches/soc-2011-salad: Merging with trunk up to r38631.

[Joerg Mueller]

Revision: 38632
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38632
Author:   nexyon
Date:     2011-07-23 16:34:27 +0000 (Sat, 23 Jul 2011)
Log Message:
-----------
Merging with trunk up to r38631.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38631

Modified Paths:
--------------
    branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.h
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py

Property Changed:
----------------
    branches/soc-2011-salad/
    branches/soc-2011-salad/intern/audaspace/OpenAL/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38625
/trunk/blender:36834-38615
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38625
/trunk/blender:36834-38631


Property changes on: branches/soc-2011-salad/intern/audaspace/OpenAL
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/soc-2010-jwilkins/intern/audaspace/OpenAL:28499-37009
/branches/soc-2010-nicolasbishop/intern/audaspace/OpenAL:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot/intern/audaspace/OpenAL:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620
/branches/soc-2011-cucumber/intern/audaspace/OpenAL:36829-36994
/branches/soc-2011-onion/intern/audaspace/OpenAL:36833-38309
/branches/soc-2011-pepper/intern/audaspace/OpenAL:36830-38208,38630
/branches/soc-2011-tomato/intern/audaspace/OpenAL:36831-38625
/trunk/blender/intern/audaspace/OpenAL:36834-38631

Modified: branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp	2011-07-23 16:08:37 UTC (rev 38631)
+++ branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp	2011-07-23 16:34:27 UTC (rev 38632)
@@ -771,12 +771,15 @@
 	return NULL;
 }
 
-void AUD_OpenALDevice::start()
+void AUD_OpenALDevice::start(bool join)
 {
 	lock();
 
 	if(!m_playing)
 	{
+		if(join)
+			pthread_join(m_thread, NULL);
+
 		pthread_attr_t attr;
 		pthread_attr_init(&attr);
 		pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
@@ -939,8 +942,8 @@
 		// stop thread
 		if(m_playingSounds.empty() || (cerr != ALC_NO_ERROR))
 		{
+			m_playing = false;
 			unlock();
-			m_playing = false;
 			pthread_exit(NULL);
 		}
 
@@ -1019,6 +1022,8 @@
 	pthread_mutex_init(&m_mutex, &attr);
 
 	pthread_mutexattr_destroy(&attr);
+
+	start(false);
 }
 
 AUD_OpenALDevice::~AUD_OpenALDevice()
@@ -1044,13 +1049,8 @@
 	alcProcessContext(m_context);
 
 	// wait for the thread to stop
-	if(m_playing)
-	{
-		unlock();
-		pthread_join(m_thread, NULL);
-	}
-	else
-		unlock();
+	unlock();
+	pthread_join(m_thread, NULL);
 
 	//delete m_bufferedFactories;
 

Modified: branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.h	2011-07-23 16:08:37 UTC (rev 38631)
+++ branches/soc-2011-salad/intern/audaspace/OpenAL/AUD_OpenALDevice.h	2011-07-23 16:34:27 UTC (rev 38632)
@@ -207,7 +207,7 @@
 	/**
 	 * Starts the streaming thread.
 	 */
-	void start();
+	void start(bool join = true);
 
 	/**
 	 * Gets the format according to the specs.

Modified: branches/soc-2011-salad/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/space_info.py	2011-07-23 16:08:37 UTC (rev 38631)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/space_info.py	2011-07-23 16:34:27 UTC (rev 38632)
@@ -60,9 +60,11 @@
         layout.template_running_jobs()
 
         layout.template_reports_banner()
+        
+        row = layout.row(align=True)
+        row.operator("wm.splash", text="", icon='BLENDER', emboss=False)
+        row.label(text=scene.statistics())
 
-        layout.label(text=scene.statistics())
-
         # XXX: this should be right-aligned to the RHS of the region
         layout.operator("wm.window_fullscreen_toggle", icon='FULLSCREEN_ENTER', text="")
 

Modified: branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py	2011-07-23 16:08:37 UTC (rev 38631)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py	2011-07-23 16:34:27 UTC (rev 38632)
@@ -68,7 +68,7 @@
         if obj:
             # Particle edit
             if obj.mode == 'PARTICLE_EDIT':
-                row.prop(toolsettings.particle_edit, "select_mode", text="", expand=True, toggle=True)
+                row.prop(toolsettings.particle_edit, "select_mode", text="", expand=True)
 
             # Occlude geometry
             if view.viewport_shade in {'SOLID', 'SHADED', 'TEXTURED'} and (obj.mode == 'PARTICLE_EDIT' or (obj.mode == 'EDIT' and obj.type == 'MESH')):