[SCM] projectm/master: Added patches to include a few new setter methods

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

The following commit has been merged in the master branch:
commit a36012757b30afdd6ab4b370639f4aa5d75a323d
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Tue Oct 19 14:29:51 2010 +0200

    Added patches to include a few new setter methods
    
    Patches are required by Clementine music player,
    inclusing fixes whishlist bug #600653

diff --git a/debian/patches/11_lprojectm_change-texture-size.patch b/debian/patches/11_lprojectm_change-texture-size.patch
new file mode 100644
index 0000000..e20db93
--- /dev/null
+++ b/debian/patches/11_lprojectm_change-texture-size.patch
@@ -0,0 +1,34 @@
+Description: Add API to change projectM texture size
+Forwarded: no
+Last-Update: 2010-10-19
+Index: projectm-2.0.1+dfsg/src/libprojectM/projectM.cpp
+===================================================================
+--- projectm-2.0.1+dfsg.orig/src/libprojectM/projectM.cpp	2010-10-15 20:32:50.717456717 +0000
++++ projectm-2.0.1+dfsg/src/libprojectM/projectM.cpp	2010-10-15 20:35:51.629456716 +0000
+@@ -898,3 +898,12 @@
+ }
+ 
+ 
++void projectM::changeTextureSize(int size) {
++  _settings.textureSize = size;
++
++  delete renderer;
++  renderer = new Renderer(_settings.windowWidth, _settings.windowHeight,
++                          _settings.meshX, _settings.meshY,
++                          _settings.textureSize, beatDetect, _settings.presetURL,
++                          _settings.titleFontURL, _settings.menuFontURL);
++}
+Index: projectm-2.0.1+dfsg/src/libprojectM/projectM.hpp
+===================================================================
+--- projectm-2.0.1+dfsg.orig/src/libprojectM/projectM.hpp	2010-10-15 20:35:58.809456716 +0000
++++ projectm-2.0.1+dfsg/src/libprojectM/projectM.hpp	2010-10-15 20:36:53.469456717 +0000
+@@ -153,8 +153,7 @@
+ 
+   virtual ~projectM();
+ 
+-
+-
++  void changeTextureSize(int size);
+ 
+ 
+   const Settings & settings() const {
diff --git a/debian/patches/12_lprojectm_change-preset-duration.patch b/debian/patches/12_lprojectm_change-preset-duration.patch
new file mode 100644
index 0000000..cfb02f8
--- /dev/null
+++ b/debian/patches/12_lprojectm_change-preset-duration.patch
@@ -0,0 +1,41 @@
+Description: Add API to change projectM preset duration
+Forwarded: no
+Last-Update: 2010-10-19
+Index: projectm-2.0.1+dfsg/src/libprojectM/TimeKeeper.hpp
+===================================================================
+--- projectm-2.0.1+dfsg.orig/src/libprojectM/TimeKeeper.hpp	2010-10-15 20:55:31.549456718 +0000
++++ projectm-2.0.1+dfsg/src/libprojectM/TimeKeeper.hpp	2010-10-15 20:56:15.177456716 +0000
+@@ -37,6 +37,8 @@
+ 
+   double sampledPresetDuration();
+ 
++  void ChangePresetDuration(int seconds) { _presetDuration = seconds; }
++
+ #ifndef WIN32
+   /* The first ticks value of the application */
+   struct timeval startTime;
+Index: projectm-2.0.1+dfsg/src/libprojectM/projectM.cpp
+===================================================================
+--- projectm-2.0.1+dfsg.orig/src/libprojectM/projectM.cpp	2010-10-15 20:55:31.561456716 +0000
++++ projectm-2.0.1+dfsg/src/libprojectM/projectM.cpp	2010-10-15 20:56:47.921456714 +0000
+@@ -907,3 +907,7 @@
+                           _settings.textureSize, beatDetect, _settings.presetURL,
+                           _settings.titleFontURL, _settings.menuFontURL);
+ }
++
++void projectM::changePresetDuration(int seconds) {
++  timeKeeper->ChangePresetDuration(seconds);
++}
+Index: projectm-2.0.1+dfsg/src/libprojectM/projectM.hpp
+===================================================================
+--- projectm-2.0.1+dfsg.orig/src/libprojectM/projectM.hpp	2010-10-15 20:55:31.573456716 +0000
++++ projectm-2.0.1+dfsg/src/libprojectM/projectM.hpp	2010-10-15 20:57:20.233456715 +0000
+@@ -154,7 +154,7 @@
+   virtual ~projectM();
+ 
+   void changeTextureSize(int size);
+-
++  void changePresetDuration(int seconds);
+ 
+   const Settings & settings() const {
+ 		return _settings;
diff --git a/debian/patches/series b/debian/patches/series
index 72dddea..fe0f698 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@
 08_qprojectm-openglcontext.patch
 09_error-handling.patch
 10_lprojectm_userfonts.patch
+11_lprojectm_change-texture-size.patch
+12_lprojectm_change-preset-duration.patch

-- 
projectm packaging