[SCM] sineshaper/master: Revert direct changes to the sources.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Jul 25 08:10:31 UTC 2011
The following commit has been merged in the master branch:
commit 6975268ddf9586166fb2f08653be3deebbbcdd37
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Jul 25 10:09:40 2011 +0200
Revert direct changes to the sources.
diff --git a/src/common/dssiplugin.hpp b/src/common/dssiplugin.hpp
index d2c77a9..4815fb9 100644
--- a/src/common/dssiplugin.hpp
+++ b/src/common/dssiplugin.hpp
@@ -26,7 +26,6 @@
#include <unistd.h>
-#include <cstdlib>
#include <cstring>
#include <string>
#include <vector>
diff --git a/src/common/dssiuiclient.hpp b/src/common/dssiuiclient.hpp
index fa79eb7..482a0fb 100644
--- a/src/common/dssiuiclient.hpp
+++ b/src/common/dssiuiclient.hpp
@@ -99,13 +99,13 @@ public:
// Host to UI
/** This signal is emitted when the host sends a new control value.
The parameters are the control port number and the new control value. */
- sigc::signal<void, int, float> control_received;
+ signal<void, int, float> control_received;
/** Emitted when the host sends a program change. The parameters are the
bank and program numbers. */
- sigc::signal<void, int, int> program_received;
+ signal<void, int, int> program_received;
/** Emitted when the host sends a configuration value. The parameters are
the configuration key and the configuration value. */
- sigc::signal<void, const string, const string> configure_received;
+ signal<void, const string, const string> configure_received;
/** Emitted when the host wants the UI to be visible. A DSSI GUI should not
show any windows until this signal is emitted. */
Dispatcher show_received;
@@ -134,7 +134,7 @@ public:
void* allocate_shared_memory(int bytes);
/** Emitted when the plugin has attached to the shared memory segment. */
- sigc::signal<void> plugin_attached;
+ signal<void> plugin_attached;
/** Returns true if the plugin has attached to the shared memory segment. */
bool plugin_has_attached();
diff --git a/src/sineshaper/sineshapergui.hpp b/src/sineshaper/sineshapergui.hpp
index c01f6af..d3a9060 100644
--- a/src/sineshaper/sineshapergui.hpp
+++ b/src/sineshaper/sineshapergui.hpp
@@ -31,11 +31,11 @@ public:
void program_selected(int bank, int program);
/** This signal is emitted when the user selects a program in the GUI. */
- sigc::signal<void, unsigned long, unsigned long> signal_select_program;
+ signal<void, unsigned long, unsigned long> signal_select_program;
/** This signal is emitted when the user has edited the programs and
the plugin needs to reload the file with the user presets. */
- sigc::signal<void> signal_programs_changed;
+ signal<void> signal_programs_changed;
protected:
--
sineshaper packaging
More information about the pkg-multimedia-commits
mailing list