[SCM] projectm/master: Cleanup set-numeric patch

[ximion-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3a6a907bd0b2d849ff11a9b1bd6d454676573d0f
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Wed Mar 23 17:52:27 2011 +0100

    Cleanup set-numeric patch
    
    Remove the whitespace-at-end-of-line
    changes which were done by Kate automatically.

diff --git a/debian/patches/14_lprojectm_set-numeric.patch b/debian/patches/14_lprojectm_set-numeric.patch
index 396651c..6c48d43 100644
--- a/debian/patches/14_lprojectm_set-numeric.patch
+++ b/debian/patches/14_lprojectm_set-numeric.patch
@@ -7,59 +7,6 @@ Author: Matthias Klumpp <matthias at nlinux.org>
 Last-Update: 2011-03-24
 --- a/src/libprojectM/projectM.cpp
 +++ b/src/libprojectM/projectM.cpp
-@@ -216,7 +216,7 @@
-     _settings.shuffleEnabled = config.read<bool> ( "Shuffle Enabled", true);
- 
-     _settings.easterEgg = config.read<float> ( "Easter Egg Parameter", 0.0);
--    _settings.softCutRatingsEnabled = 
-+    _settings.softCutRatingsEnabled =
- 	config.read<float> ( "Soft Cut Ratings Enabled", false);
- 
-     projectM_init ( _settings.meshX, _settings.meshY, _settings.fps,
-@@ -298,9 +298,9 @@
-     void projectM::renderFrame()
-     {
-         #ifdef SYNC_PRESET_SWITCHES
--        pthread_mutex_lock(&preset_mutex);       
--        #endif 
--      
-+        pthread_mutex_lock(&preset_mutex);
-+        #endif
-+
-         #ifdef DEBUG
-         char fname[1024];
-         FILE *f = NULL;
-@@ -361,7 +361,7 @@
-         if ( timeKeeper->IsSmoothing() && timeKeeper->SmoothRatio() <= 1.0 && !m_presetChooser->empty() )
-         {
- 
--	
-+
-             //	 printf("start thread\n");
-             assert ( m_activePreset2.get() );
- 
-@@ -392,7 +392,7 @@
- 
- 	    pipeline.drawables.clear();
- 
--	    /*		
-+	    /*
- 	    while (!pipeline.drawables.empty()) {
- 		delete(pipeline.drawables.back());
- 		pipeline.drawables.pop_back();
-@@ -447,9 +447,9 @@
-         #endif /** !WIN32 */
- 
- 	#ifdef SYNC_PRESET_SWITCHES
--        pthread_mutex_unlock(&preset_mutex);        
--        #endif 
--	
-+        pthread_mutex_unlock(&preset_mutex);
-+        #endif
-+
-     }
- 
-     void projectM::projectM_reset()
 @@ -461,11 +461,14 @@
  
          this->fpsstart = 0;
@@ -75,55 +22,3 @@ Last-Update: 2011-03-24
  
          /** Initialise start time */
          timeKeeper = new TimeKeeper(_settings.presetDuration,_settings.smoothPresetDuration, _settings.easterEgg);
-@@ -494,9 +497,9 @@
- 
-         #ifdef USE_THREADS
-         pthread_mutex_init(&mutex, NULL);
--        
-+
- 	#ifdef SYNC_PRESET_SWITCHES
--        pthread_mutex_init(&preset_mutex, NULL);        
-+        pthread_mutex_init(&preset_mutex, NULL);
- 	#endif
- 
-         pthread_cond_init(&condition, NULL);
-@@ -772,19 +775,19 @@
- 			timeKeeper->StartPreset();
- 		}
- 		presetSwitchedEvent(hardCut, **m_presetPos);
--		
--	
-+
-+
- }
- 
- /**
-- * 
-- * @param targetPreset 
-+ *
-+ * @param targetPreset
-  */
- void projectM::switchPreset(std::auto_ptr<Preset> & targetPreset) {
- 
--	#ifdef SYNC_PRESET_SWITCHES	
--	pthread_mutex_lock(&preset_mutex);	
--	#endif 
-+	#ifdef SYNC_PRESET_SWITCHES
-+	pthread_mutex_lock(&preset_mutex);
-+	#endif
- 
-         targetPreset = m_presetPos->allocate();
- 
-@@ -792,9 +795,9 @@
-         renderer->setPresetName(targetPreset->name());
-         renderer->SetPipeline(targetPreset->pipeline());
- 
--	#ifdef SYNC_PRESET_SWITCHES	
--	pthread_mutex_unlock(&preset_mutex);	
--	#endif 
-+	#ifdef SYNC_PRESET_SWITCHES
-+	pthread_mutex_unlock(&preset_mutex);
-+	#endif
-     }
- 
-     void projectM::setPresetLock ( bool isLocked )

-- 
projectm packaging