[SCM] calf/master: More cleanups.
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:40:03 UTC 2013
The following commit has been merged in the master branch:
commit a9e559445dac024fa218d6d3adcf7e1e5f9ed96a
Author: Krzysztof Foltman <wdev at foltman.com>
Date: Wed Apr 7 00:00:55 2010 +0100
More cleanups.
Reduce dependencies between header files. Move more implementations into
.cpp files (especially when that implementation adds a dependency to the
header). Remove commented out code.
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index a1799c4..bdc61b3 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -20,22 +20,19 @@
#define BENCHMARK_PLUGINS
-#include <assert.h>
-#include <getopt.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <config.h>
-#include <calf/audio_fx.h>
-
#ifdef BENCHMARK_PLUGINS
#include <calf/giface.h>
#include <calf/modules.h>
#include <calf/modules_dev.h>
+#else
+#include <config.h>
#endif
+#include <calf/audio_fx.h>
+#include <calf/fft.h>
#include <calf/loudness.h>
#include <calf/benchmark.h>
+#include <getopt.h>
// #define TEST_OSC
diff --git a/src/calf/audio_fx.h b/src/calf/audio_fx.h
index 6c8ad10..34a3b17 100644
--- a/src/calf/audio_fx.h
+++ b/src/calf/audio_fx.h
@@ -21,14 +21,12 @@
#ifndef __CALF_AUDIOFX_H
#define __CALF_AUDIOFX_H
-#include <complex>
-#include <iostream>
-#include <calf/biquad.h>
-#include <calf/onepole.h>
-#include "primitives.h"
+#include "biquad.h"
#include "delay.h"
#include "fixed_point.h"
#include "inertia.h"
+#include "onepole.h"
+#include <complex>
namespace dsp {
#if 0
diff --git a/src/calf/giface.h b/src/calf/giface.h
index 4982d40..5160575 100644
--- a/src/calf/giface.h
+++ b/src/calf/giface.h
@@ -22,13 +22,11 @@
#define CALF_GIFACE_H
#include <config.h>
-#include <stdint.h>
-#include <stdlib.h>
+#include "primitives.h"
+#include <complex>
#include <exception>
#include <string>
-#include <complex>
-#include "primitives.h"
-#include "preset.h"
+#include <vector>
namespace osctl {
struct osc_client;
@@ -235,7 +233,7 @@ struct table_edit_iface
virtual uint32_t get_table_rows(int param) const = 0;
/// retrieve data item from the plugin
- virtual std::string get_cell(int param, int row, int column) const { return calf_utils::i2s(row)+":"+calf_utils::i2s(column); }
+ virtual std::string get_cell(int param, int row, int column) const;
/// set data item to the plugin
virtual void set_cell(int param, int row, int column, const std::string &src, std::string &error) const { error.clear(); }
diff --git a/src/calf/ladspa_wrap.h b/src/calf/ladspa_wrap.h
index 1f3ebee..14788b9 100644
--- a/src/calf/ladspa_wrap.h
+++ b/src/calf/ladspa_wrap.h
@@ -28,6 +28,7 @@
#include <dssi.h>
#endif
#include "giface.h"
+#include "preset.h"
namespace calf_plugins {
diff --git a/src/calf/modules_synths.h b/src/calf/modules_synths.h
index 42e8f83..68beb73 100644
--- a/src/calf/modules_synths.h
+++ b/src/calf/modules_synths.h
@@ -21,7 +21,6 @@
#ifndef __CALF_MODULES_SYNTHS_H
#define __CALF_MODULES_SYNTHS_H
-#include <assert.h>
#include "biquad.h"
#include "onepole.h"
#include "audio_fx.h"
diff --git a/src/calf/organ.h b/src/calf/organ.h
index 43dec49..d7177d4 100644
--- a/src/calf/organ.h
+++ b/src/calf/organ.h
@@ -22,10 +22,10 @@
#ifndef __CALF_ORGAN_H
#define __CALF_ORGAN_H
-#include "osc.h"
-#include "synth.h"
#include "envelope.h"
#include "metadata.h"
+#include "osc.h"
+#include "synth.h"
#define ORGAN_KEYTRACK_POINTS 4
diff --git a/src/calf/preset.h b/src/calf/preset.h
index c74a8fe..c6b93a7 100644
--- a/src/calf/preset.h
+++ b/src/calf/preset.h
@@ -22,10 +22,6 @@
#define __CALF_PRESET_H
#include <vector>
-#include <string>
-#include <map>
-#include <sstream>
-#include <ostream>
#include <string.h>
#include "utils.h"
diff --git a/src/calf/primitives.h b/src/calf/primitives.h
index bd68f50..a9cb95e 100644
--- a/src/calf/primitives.h
+++ b/src/calf/primitives.h
@@ -21,13 +21,12 @@
#ifndef __CALF_PRIMITIVES_H
#define __CALF_PRIMITIVES_H
-#include <stack>
-#include <map>
-#include <cmath>
-#include <cstdlib>
#include <assert.h>
#include <stdint.h>
#include <stdio.h>
+#include <cmath>
+#include <cstdlib>
+#include <map>
namespace dsp {
diff --git a/src/calf/synth.h b/src/calf/synth.h
index dc5c8eb..d009830 100644
--- a/src/calf/synth.h
+++ b/src/calf/synth.h
@@ -22,11 +22,11 @@
#ifndef __CALF_SYNTH_H
#define __CALF_SYNTH_H
+#include "audio_fx.h"
+#include <memory.h>
+#include <bitset>
#include <list>
#include <stack>
-#include <bitset>
-#include "primitives.h"
-#include "audio_fx.h"
namespace dsp {
diff --git a/src/calf/utils.h b/src/calf/utils.h
index cb1e252..9177c92 100644
--- a/src/calf/utils.h
+++ b/src/calf/utils.h
@@ -125,8 +125,8 @@ struct file_exception: public std::exception
const char *text;
std::string message, filename, container;
public:
- file_exception(const std::string &f) : message(strerror(errno)), filename(f), container(filename + ":" + message) { text = container.c_str(); }
- file_exception(const std::string &f, const std::string &t) : message(t), filename(f), container(filename + ":" + message) { text = container.c_str(); }
+ file_exception(const std::string &f);
+ file_exception(const std::string &f, const std::string &t);
virtual const char *what() const throw () { return text; }
virtual ~file_exception() throw () {}
};
diff --git a/src/dssigui.cpp b/src/dssigui.cpp
index 8041193..650c17e 100644
--- a/src/dssigui.cpp
+++ b/src/dssigui.cpp
@@ -17,17 +17,11 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
-#include <assert.h>
-#include <getopt.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <config.h>
#include <calf/giface.h>
#include <calf/gui.h>
-#include <calf/main_win.h>
-#include <calf/osctl.h>
-#include <calf/osctlnet.h>
#include <calf/osctl_glib.h>
+#include <calf/preset.h>
+#include <getopt.h>
using namespace std;
using namespace dsp;
diff --git a/src/fluidsynth.cpp b/src/fluidsynth.cpp
index 0026eef..8ffd906 100644
--- a/src/fluidsynth.cpp
+++ b/src/fluidsynth.cpp
@@ -18,16 +18,11 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
-#include <assert.h>
-#include <memory.h>
-#include <config.h>
-#include <complex>
-#if USE_JACK
-#include <jack/jack.h>
-#endif
#include <calf/giface.h>
#include <calf/modules_synths.h>
#include <calf/modules_dev.h>
+#include <calf/utils.h>
+#include <memory.h>
#if ENABLE_EXPERIMENTAL
diff --git a/src/giface.cpp b/src/giface.cpp
index 997e1b7..f070373 100644
--- a/src/giface.cpp
+++ b/src/giface.cpp
@@ -23,7 +23,9 @@
#include <memory.h>
#include <calf/giface.h>
#include <calf/osctlnet.h>
+#include <calf/utils.h>
#include <stdio.h>
+
using namespace std;
using namespace calf_utils;
using namespace calf_plugins;
@@ -327,6 +329,13 @@ const plugin_metadata_iface *calf_plugins::plugin_registry::get_by_id(const char
}
///////////////////////////////////////////////////////////////////////////////////////
+std::string table_edit_iface::get_cell(int param, int row, int column) const
+{
+ return calf_utils::i2s(row)+":"+calf_utils::i2s(column);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
#if USE_EXEC_GUI
struct osc_cairo_control: public cairo_iface
{
diff --git a/src/gui.cpp b/src/gui.cpp
index 19270f7..1d01227 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -18,14 +18,9 @@
* Boston, MA 02110-1301 USA
*/
-#include <config.h>
-#include <assert.h>
-#include <calf/giface.h>
-#include <calf/gui.h>
#include <calf/gui_controls.h>
#include <calf/preset.h>
#include <calf/preset_gui.h>
-#include <calf/main_win.h>
#include <gdk/gdk.h>
#include <iostream>
diff --git a/src/jackhost.cpp b/src/jackhost.cpp
index 58a4b2e..f2f078a 100644
--- a/src/jackhost.cpp
+++ b/src/jackhost.cpp
@@ -24,6 +24,7 @@
#include <calf/modules.h>
#include <calf/modules_dev.h>
#include <calf/organ.h>
+#include <calf/preset.h>
#include <getopt.h>
using namespace std;
diff --git a/src/lv2gui.cpp b/src/lv2gui.cpp
index 1cb667e..03ea03e 100644
--- a/src/lv2gui.cpp
+++ b/src/lv2gui.cpp
@@ -17,9 +17,7 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
-#include <assert.h>
#include <sys/wait.h>
-#include <calf/giface.h>
#include <calf/gui.h>
#include <calf/lv2_data_access.h>
#include <calf/lv2_string_port.h>
@@ -28,6 +26,7 @@
#include <calf/lv2_external_ui.h>
#include <calf/osctlnet.h>
#include <calf/preset_gui.h>
+#include <calf/utils.h>
#include <calf/lv2helpers.h>
using namespace std;
diff --git a/src/main_win.cpp b/src/main_win.cpp
index f085791..a323b2f 100644
--- a/src/main_win.cpp
+++ b/src/main_win.cpp
@@ -18,8 +18,6 @@
* Boston, MA 02110-1301 USA
*/
-#include <assert.h>
-#include <config.h>
#include <calf/ctl_led.h>
#include <calf/giface.h>
#include <calf/gui.h>
@@ -139,14 +137,6 @@ void main_window::del_plugin(plugin_ctl_iface *plugin)
int rows = 0, cols = 0;
g_object_get(G_OBJECT(strips_table), "n-rows", &rows, "n-columns", &cols, NULL);
gtk_table_resize(GTK_TABLE(strips_table), rows - 4, cols);
- /*
- // a hack to remove unneeded vertical space from the window
- // not perfect, as it undoes user's vertical resize
- // only needed when window is resizable though
- int width, height;
- gtk_window_get_size(toplevel, &width, &height);
- gtk_window_resize(toplevel, width, 1);
- */
}
void main_window::set_window(plugin_ctl_iface *plugin, plugin_gui_window *gui_win)
@@ -425,13 +415,6 @@ static void action_destroy_notify(gpointer data)
delete (main_window::add_plugin_params *)data;
}
-/*
-void main_window::new_plugin(const char *plugin)
-{
- printf("new plugin %s\n", plugin);
-}
-*/
-
std::string main_window::make_plugin_list(GtkActionGroup *actions)
{
string s = plugin_pre_xml;
@@ -478,13 +461,6 @@ void main_window::create()
gtk_table_set_col_spacings(GTK_TABLE(strips_table), 0);
gtk_table_set_row_spacings(GTK_TABLE(strips_table), 0);
-// gtk_table_attach(GTK_TABLE(strips_table), gtk_label_new(""), 0, 1, 0, 1, GTK_FILL, GTK_SHRINK, 28, 5);
-// gtk_table_attach(GTK_TABLE(strips_table), gtk_label_new("Module"), 1, 2, 0, 1, GTK_FILL, GTK_SHRINK, 80, 5);
-// gtk_table_attach(GTK_TABLE(strips_table), gtk_label_new("MIDI"), 2, 3, 0, 1, GTK_FILL, GTK_SHRINK, 15, 5);
-// gtk_table_attach(GTK_TABLE(strips_table), gtk_label_new("audio in"), 3, 4, 0, 1, GTK_FILL, GTK_SHRINK, 80, 5);
-// gtk_table_attach(GTK_TABLE(strips_table), gtk_label_new("audio out"), 4, 5, 0, 1, GTK_FILL, GTK_SHRINK, 80, 5);
-// gtk_table_attach(GTK_TABLE(strips_table), gtk_label_new(""), 5, 6, 0, 1, GTK_FILL, GTK_SHRINK, 28, 5);
-
for(GList *p = GTK_TABLE(strips_table)->children; p != NULL; p = p->next)
{
GtkTableChild *c = (GtkTableChild *)p->data;
diff --git a/src/makerdf.cpp b/src/makerdf.cpp
index cd8aa8c..3db9831 100644
--- a/src/makerdf.cpp
+++ b/src/makerdf.cpp
@@ -17,18 +17,16 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
-#include <assert.h>
-#include <getopt.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <config.h>
#include <calf/giface.h>
+#include <calf/preset.h>
#include <calf/utils.h>
#if USE_LV2
#include <calf/lv2_contexts.h>
#include <calf/lv2_event.h>
#include <calf/lv2_uri_map.h>
#endif
+#include <getopt.h>
+#include <string.h>
#include <set>
using namespace std;
diff --git a/src/modmatrix.cpp b/src/modmatrix.cpp
index c3bb4f7..2ef798a 100644
--- a/src/modmatrix.cpp
+++ b/src/modmatrix.cpp
@@ -18,9 +18,10 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
-#include <assert.h>
-#include <sstream>
#include <calf/modmatrix.h>
+#include <calf/utils.h>
+#include <memory.h>
+#include <sstream>
using namespace std;
using namespace dsp;
diff --git a/src/monosynth.cpp b/src/monosynth.cpp
index fef489c..ac9e6eb 100644
--- a/src/monosynth.cpp
+++ b/src/monosynth.cpp
@@ -18,13 +18,6 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
-#include <assert.h>
-#include <memory.h>
-#include <config.h>
-#include <complex>
-#if USE_JACK
-#include <jack/jack.h>
-#endif
#include <calf/giface.h>
#include <calf/modules_synths.h>
diff --git a/src/organ.cpp b/src/organ.cpp
index 60ca39b..34aa7d5 100644
--- a/src/organ.cpp
+++ b/src/organ.cpp
@@ -20,12 +20,6 @@
*/
#include <config.h>
-#include <assert.h>
-#include <memory.h>
-#include <complex>
-#if USE_JACK
-#include <jack/jack.h>
-#endif
#include <calf/giface.h>
#include <calf/organ.h>
#include <iostream>
diff --git a/src/osctl.cpp b/src/osctl.cpp
index a89ed52..2fcc58e 100644
--- a/src/osctl.cpp
+++ b/src/osctl.cpp
@@ -1,12 +1,4 @@
#include <calf/osctl.h>
-#include <assert.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <stdlib.h>
-#include <sstream>
-
-using namespace osctl;
-using namespace std;
const char *osctl::osc_type_name(osc_type type)
{
diff --git a/src/osctl_glib.cpp b/src/osctl_glib.cpp
index 92465e0..b4763d1 100644
--- a/src/osctl_glib.cpp
+++ b/src/osctl_glib.cpp
@@ -19,10 +19,7 @@
* Boston, MA 02110-1301 USA
*/
-#include <calf/osctl.h>
#include <calf/osctl_glib.h>
-#include <assert.h>
-#include <sys/socket.h>
using namespace osctl;
using namespace std;
diff --git a/src/preset.cpp b/src/preset.cpp
index 2a95b07..e1798c0 100644
--- a/src/preset.cpp
+++ b/src/preset.cpp
@@ -19,18 +19,13 @@
* Boston, MA 02110-1301 USA
*/
-#include <config.h>
+#include <calf/giface.h>
+#include <calf/preset.h>
+#include <expat.h>
#include <fcntl.h>
-#include <stdlib.h>
#include <errno.h>
-#include <string.h>
#include <sys/stat.h>
-#include <expat.h>
-#include <calf/preset.h>
-#include <calf/giface.h>
-#include <calf/utils.h>
-
using namespace std;
using namespace calf_plugins;
using namespace calf_utils;
diff --git a/src/preset_gui.cpp b/src/preset_gui.cpp
index 86adf92..f0e4ff2 100644
--- a/src/preset_gui.cpp
+++ b/src/preset_gui.cpp
@@ -17,14 +17,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-#include <map>
-#include <glade/glade.h>
-#include <calf/giface.h>
#include <calf/gui.h>
#include <calf/preset.h>
#include <calf/preset_gui.h>
-#include <calf/main_win.h>
+#include <glade/glade.h>
using namespace calf_plugins;
using namespace std;
diff --git a/src/utils.cpp b/src/utils.cpp
index d2dc9ab..6f931b0 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -17,11 +17,10 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
-#include <stdio.h>
-#include <assert.h>
#include <config.h>
#include <calf/osctl.h>
#include <calf/utils.h>
+#include <stdio.h>
#include <sstream>
using namespace std;
@@ -131,4 +130,22 @@ std::string indent(const std::string &src, const std::string &indent)
return dest;
}
+//////////////////////////////////////////////////////////////////////////////////
+
+file_exception::file_exception(const std::string &f)
+: message(strerror(errno))
+, filename(f)
+, container(filename + ":" + message)
+{
+ text = container.c_str();
+}
+
+file_exception::file_exception(const std::string &f, const std::string &t)
+: message(t)
+, filename(f)
+, container(filename + ":" + message)
+{
+ text = container.c_str();
+}
+
}
diff --git a/src/wavetable.cpp b/src/wavetable.cpp
index 2da7993..4d41f9b 100644
--- a/src/wavetable.cpp
+++ b/src/wavetable.cpp
@@ -18,16 +18,11 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
+
#include <config.h>
#if ENABLE_EXPERIMENTAL
-#include <assert.h>
-#include <memory.h>
-#include <complex>
-#if USE_JACK
-#include <jack/jack.h>
-#endif
#include <calf/giface.h>
#include <calf/modules_synths.h>
#include <iostream>
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list