[SCM] calf/master: Merge branch 'master' into style
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:40:08 UTC 2013
Speed up compressor-based plugins.
More cleanups.
More cleanups.
Clean up the JACK host.
More simplification of the internal APIs.
Remove excessive pseudo-cleverness messing code up.
Un-inline most of biquad_filter_module implementation.
More cleanup work.
Remove old (outdated) amp plugin example.
More cleanups.
More de-inlinization and refactoring.
More de-inlining.
Move large methods of Calf Organ-related classes into .cpp file.
Remove unnecessary checks for TempSendSetter.
Implement marshalling of waveform and filter response graphs.
Comment out the clearlooks engine setting that conflicts with Ardour.
Add two-way string port support.
More work on the External UI. Add one-way string port support.
More work on external UI. Should be somewhat functional now.
Re-enable GTK+ GUI.
Consume all messages in osc_server::read_from_socket()
More external GUI related changes.
More work on external UI.
Add GNOME category and version number to the calf.desktop file.
Add pixmap_path to the gtkrc. Move install actions from src/ to gui/
Remove gtk_rc_parse.
More small plugin zombie carnage.
Remove more zombie small plugin code.
Simplify Multiband Compressor code and fix several bugs.
Fix multiple assertions when closing main window.
Remove zombie small plugin code.
Remove small plugins together with all the supporting infrastructure.
Add Doxygen documentation for plugin_registry class.
More refactoring.
General refactoring. Start implementing external GUI.
+ LV2: add external UI header (not used for anything yet)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6a3c1a63a147948535a50da009275278ad5e6a3
X-Git-Newrev: 34569260c452f0fa4c543155ebba174a42a343dc
The following commit has been merged in the master branch:
commit 49bcfb9bcbca37d4f5905674269f4ec79547de84
Merge: e6ecbf7c145592a78d747b301730c176d62f550e 8ad44088e31dd32d8e9ca9a8aa974017a9f67eff
Author: Krzysztof <wdev at foltman.com>
Date: Tue May 4 23:40:18 2010 +0100
Merge branch 'master' into style
Conflicts:
gui/calf.rc.in
src/main_win.cpp
diff --combined gui/calf.rc.in
index 16bded8,dd8f389..e60e233
--- a/gui/calf.rc.in
+++ b/gui/calf.rc.in
@@@ -8,6 -8,8 +8,8 @@@
gtk_color_scheme = "fg_color:#101010\nbg_color:#EFEBE7\nbase_color:#FFF\ntext_color:#1A1A1A\nselected_bg_color:#FFA443\nselected_fg_color:#1A1A1A\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000"
+ pixmap_path "@pkgdatadir@"
+
style "calf-default"
{
########
@@@ -87,7 -89,7 +89,7 @@@
bg_pixmap[NORMAL] = "background_dark.png"
bg_pixmap[SELECTED] = "background_black.png"
bg_pixmap[ACTIVE] = "background_black.png"
- bg_pixmap[INSENSITIVE] = "background_dark.png"
+ bg_pixmap[INSENSITIVE] = "background_dark.png"
engine "pixmap"
{
@@@ -209,8 -211,8 +211,8 @@@
{
function = SHADOW_GAP
recolorable = TRUE
- file = "frame_top.png"
- border = { 12, 12, 2, 12 }
+ file = "frame.png"
+ border = { 12, 12, 12, 12 }
stretch = TRUE
gap_start_file = "frame_top_start.png"
gap_start_border = { 12, 2, 12, 2 }
@@@ -222,8 -224,8 +224,8 @@@
{
function = SHADOW_GAP
recolorable = TRUE
- file = "frame_left.png"
- border = { 2, 12, 12, 12 }
+ file = "frame.png"
+ border = { 12, 12, 12, 12 }
stretch = TRUE
gap_start_file = "frame_left_start.png"
gap_start_border = { 12, 2, 12, 2 }
@@@ -235,8 -237,8 +237,8 @@@
{
function = SHADOW_GAP
recolorable = TRUE
- file = "frame_right.png"
- border = { 12, 2, 12, 12 }
+ file = "frame.png"
+ border = { 12, 12, 12, 12 }
stretch = TRUE
gap_start_file = "frame_right_start.png"
gap_start_border = { 2, 12, 12, 2 }
@@@ -248,8 -250,8 +250,8 @@@
{
function = SHADOW_GAP
recolorable = TRUE
- file = "frame_bottom.png"
- border = { 12, 12, 12, 2 }
+ file = "frame.png"
+ border = { 12, 12, 12, 12 }
stretch = TRUE
gap_start_file = "frame_bottom_start.png"
gap_start_border = { 12, 2, 2, 12 }
@@@ -1641,6 -1643,10 +1643,6 @@@ style "calf-frame
xthickness = 8
ythickness = 8
bg[NORMAL] = "#ddd"
-# engine "clearlooks"
-# {
-# radius = 7.0
-# }
}
style "calf-frame-title"
@@@ -1697,67 -1703,66 +1699,67 @@@ style "calf-tooltips" = "calf-wider
################################################################################
# Theme default style is applied to every widget
-widget "*Calf*" style : theme "calf-default"
+widget "*Calf*" style : highest "calf-default"
# Rack
-widget "*Calf-Rack*" style : theme "calf-rack"
+widget "*Calf-Rack*" style : highest "calf-rack"
# Labels
-widget "*Calf-Label" style : theme "calf-label"
+widget "*Calf-Label" style : highest "calf-label"
# Values
-widget "*Calf-Value" style : theme "calf-label"
+widget "*Calf-Value" style : highest "calf-label"
# Menus
-widget_class "*Calf*<GtkMenuBar>*" style : rc "calf-menubar"
-widget "*Calf-Menu*" style : rc "calf-menu"
-widget_class "*Calf*<GtkMenuShell>*" style : rc "calf-menu"
-widget "*Calf*SeparatorMenuItem*" style : rc "calf-menu-separator"
-widget_class "*Calf*<GtkMenuItem>*" style : rc "calf-menu-item"
+widget_class "*Calf*<GtkMenuBar>*" style : highest "calf-menubar"
+widget "*Calf-Menu*" style : highest "calf-menu"
+widget_class "*Calf*<GtkMenuShell>*" style : highest "calf-menu"
+widget "*Calf*SeparatorMenuItem*" style : highest "calf-menu-separator"
+widget_class "*Calf*<GtkMenuItem>*" style : highest "calf-menu-item"
# Notebook
-widget_class "*<GtkNotebook>" style : highest "calf-notebook"
+widget "*Calf*Notebook" style : highest "calf-notebook"
+widget_class "*Calf*Notebook.<GtkWidget>" style : highest "calf-notebook"
# Frame
-widget "*Calf*Frame" style : rc "calf-frame"
-widget "*Calf*Frame.GtkLabel" style : rc "calf-frame-title"
+widget "*Calf*Frame" style : highest "calf-frame"
+widget "*Calf*Frame.GtkLabel" style : highest "calf-frame-title"
# Scrolled window
widget "*Calf-Container" style : highest "calf-container"
# Treeview
-widget_class "*Calf*.<GtkTreeView>*" style : theme "calf-treeview"
-widget_class "*Calf*.<GtkTreeView>.<GtkButton>*" style : rc "calf-treeview-header"
-widget_class "*Calf*.<GtkCTree>.<GtkButton>*" style : rc "calf-treeview-header"
-widget_class "*Calf*.<GtkList>.<GtkButton>*" style : rc "calf-treeview-header"
-widget_class "*Calf*.<GtkCList>.<GtkButton>*" style : rc "calf-treeview-header"
+widget_class "*Calf*.<GtkTreeView>*" style : highest "calf-treeview"
+widget_class "*Calf*.<GtkTreeView>.<GtkButton>*" style : highest "calf-treeview-header"
+widget_class "*Calf*.<GtkCTree>.<GtkButton>*" style : highest "calf-treeview-header"
+widget_class "*Calf*.<GtkList>.<GtkButton>*" style : highest "calf-treeview-header"
+widget_class "*Calf*.<GtkCList>.<GtkButton>*" style : highest "calf-treeview-header"
# Buttons
-widget "*Calf*Button*" style : theme "calf-button"
-widget "*Calf*Toggle*" style : rc "calf-toggle"
+widget "*Calf*Button*" style : highest "calf-button"
+widget "*Calf*Toggle*" style : highest "calf-toggle"
widget "*Calf-Button" style : highest "calf-button"
widget "*Calf-Toggle" style : highest "calf-toggle"
widget "*Calf*CheckButton" style : highest "calf-toggle"
widget "*Calf*RadioButton" style : highest "calf-toggle"
-widget "*Calf*GtkLinkButton*" style : rc "calf-button"
-widget "*Calf*GtkScaleButton*" style : rc "calf-button"
-widget "*Calf*GtkColorButton*" style : rc "calf-button"
-widget "*Calf*FileChooserButton*" style : rc "calf-button"
-widget "*Calf*GtkFontButton*" style : rc "calf-button"
+widget "*Calf*GtkLinkButton*" style : highest "calf-button"
+widget "*Calf*GtkScaleButton*" style : highest "calf-button"
+widget "*Calf*GtkColorButton*" style : highest "calf-button"
+widget "*Calf*FileChooserButton*" style : highest "calf-button"
+widget "*Calf*GtkFontButton*" style : highest "calf-button"
-widget "*Calf-Combobox*" style : theme "calf-combobox"
-widget "*Calf*Combo*" style : rc "calf-combobox"
-widget_class "*Calf-Combobox*<GtkComboBoxEntry>*" style : theme "calf-comboboxentry"
-widget "*Calf*GtkOptionMenu*" style : theme "calf-combobox"
+widget "*Calf-Combobox*" style : highest "calf-combobox"
+widget "*Calf*Combo*" style : highest "calf-combobox"
+widget_class "*Calf-Combobox*<GtkComboBoxEntry>*" style : highest "calf-comboboxentry"
+widget "*Calf*GtkOptionMenu*" style : highest "calf-combobox"
# Entries
-widget "*Calf*Entry*" style : rc "calf-entry"
+widget "*Calf*Entry*" style : highest "calf-entry"
widget "*Calf*SpinButton*" style : highest "calf-spinbutton"
# Miscellaneous
-widget_class "*Calf*<GtkStatusbar>" style "calf-statusbar"
-widget_class "*Calf*<GtkProgressBar>" style "calf-progressbar"
+widget_class "*Calf*<GtkStatusbar>" style : highest "calf-statusbar"
+widget_class "*Calf*<GtkProgressBar>" style : highest "calf-progressbar"
# Scrollbars/Scales
widget "*Calf*Range" style : highest "calf-scale-small"
diff --combined src/main_win.cpp
index 1940016,a323b2f..0868e51
--- a/src/main_win.cpp
+++ b/src/main_win.cpp
@@@ -18,8 -18,6 +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 +137,6 @@@ void main_window::del_plugin(plugin_ctl
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)
@@@ -157,11 -147,19 +147,14 @@@
if (!strip)
return;
strip->gui_win = gui_win;
- if (!is_closed)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(strip->button), gui_win != NULL);
+ if (gui_win)
+ {
+ if (!is_closed)
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(strip->button), gui_win != NULL);
- GtkToggleButton *tb = GTK_TOGGLE_BUTTON(strip->button);
- gtk_button_set_label(GTK_BUTTON(tb), "Edit");
+ GtkToggleButton *tb = GTK_TOGGLE_BUTTON(strip->button);
- if (strip->gui_win) {
- gtk_button_set_label(GTK_BUTTON(tb), "Hide");
- } else {
- gtk_button_set_label(GTK_BUTTON(tb), "Show");
- }
++ gtk_button_set_label(GTK_BUTTON(tb), "Edit");
+ }
-
}
void main_window::refresh_all_presets(bool builtin_too)
@@@ -185,8 -183,10 +178,8 @@@ gui_button_pressed(GtkWidget *button, m
if (strip->gui_win) {
strip->gui_win->close();
strip->gui_win = NULL;
- gtk_button_set_label(GTK_BUTTON(tb), "Show");
} else {
strip->main_win->open_gui(strip->plugin);
- gtk_button_set_label(GTK_BUTTON(tb), "Hide");
}
return TRUE;
}
@@@ -251,14 -251,15 +244,15 @@@ main_window::plugin_strip *main_window:
// title @ 1, 1
char buf[128];
- sprintf(buf, "<span size=\"15000\">%s</span>", plugin->get_label());
+ const plugin_metadata_iface *metadata = plugin->get_metadata_iface();
+ sprintf(buf, "<span size=\"15000\">%s</span>", metadata->get_label());
GtkWidget *title = gtk_label_new(NULL);
gtk_label_set_markup(GTK_LABEL(title), buf);
gtk_table_attach(GTK_TABLE(strips_table), title, 1, 2, row, row + 1, ao, GTK_SHRINK, 20, 10);
gtk_widget_show(title);
// open button
- GtkWidget *label = gtk_toggle_button_new_with_label("Show");
+ GtkWidget *label = gtk_toggle_button_new_with_label("Edit");
strip->button = label;
gtk_widget_set_size_request(GTK_WIDGET(label), 110, -1);
gtk_signal_connect(GTK_OBJECT(label), "toggled", G_CALLBACK(gui_button_pressed),
@@@ -281,7 -282,7 +275,7 @@@
gtk_widget_show(buttonBox);
// midi box
- if (plugin->get_midi()) {
+ if (metadata->get_midi()) {
label = calf_led_new();
GtkWidget *midiBox = gtk_vbox_new(FALSE, 1);
gtk_box_pack_start(GTK_BOX(midiBox), GTK_WIDGET(gtk_label_new("MIDI")), TRUE, TRUE, 0);
@@@ -302,9 -303,8 +296,8 @@@
for (int i = 0; i < 2; i++)
strip->audio_in[i] = strip->audio_out[i] = NULL;
-
-
- if (plugin->get_input_count() == 2) {
+
+ if (metadata->get_input_count() == 2) {
GtkWidget *inBox = gtk_vbox_new(FALSE, 1);
@@@ -328,7 -328,7 +321,7 @@@
gtk_widget_set_size_request(GTK_WIDGET(inBox), 160, -1);
}
- if (plugin->get_output_count() == 2) {
+ if (metadata->get_output_count() == 2) {
GtkWidget *outBox = gtk_vbox_new(FALSE, 1);
@@@ -385,8 -385,8 +378,8 @@@ void main_window::update_strip(plugin_c
void main_window::open_gui(plugin_ctl_iface *plugin)
{
- plugin_gui_window *gui_win = new plugin_gui_window(this);
- gui_win->create(plugin, (prefix + plugin->get_label()).c_str(), plugin->get_id());
+ plugin_gui_window *gui_win = new plugin_gui_window(this, this);
+ gui_win->create(plugin, (prefix + plugin->get_metadata_iface()->get_label()).c_str(), plugin->get_metadata_iface()->get_id());
gtk_widget_show_all(GTK_WIDGET(gui_win->toplevel));
plugins[plugin]->gui_win = gui_win;
}
@@@ -415,28 -415,18 +408,18 @@@ static void action_destroy_notify(gpoin
delete (main_window::add_plugin_params *)data;
}
std::string main_window::make_plugin_list(GtkActionGroup *actions)
{
string s = plugin_pre_xml;
- std::vector<plugin_metadata_iface *> plugins;
- calf_plugins::get_all_plugins(plugins);
+ const plugin_registry::plugin_vector &plugins = plugin_registry::instance().get_all();
for(unsigned int i = 0; i < plugins.size(); i++)
{
- plugin_metadata_iface *p = plugins[i];
+ const plugin_metadata_iface *p = plugins[i];
string action_name = "Add" + string(p->get_id())+"Action";
s += string("<menuitem action=\"") + action_name + "\" />";
GtkActionEntry ae = { action_name.c_str(), NULL, p->get_label(), NULL, NULL, (GCallback)add_plugin_action };
gtk_action_group_add_actions_full(actions, &ae, 1, (gpointer)new add_plugin_params(this, p->get_id()), action_destroy_notify);
- delete p;
}
- plugins.clear();
return s + plugin_post_xml;
}
@@@ -471,13 -461,6 +454,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;
@@@ -541,15 -524,15 +517,15 @@@ gboolean main_window::on_idle(void *dat
plugin_ctl_iface *plugin = i->first;
plugin_strip *strip = i->second;
int idx = 0;
- if (plugin->get_input_count() == 2) {
+ if (plugin->get_metadata_iface()->get_input_count() == 2) {
calf_vumeter_set_value(CALF_VUMETER(strip->audio_in[0]), LVL(plugin->get_level(idx++)));
calf_vumeter_set_value(CALF_VUMETER(strip->audio_in[1]), LVL(plugin->get_level(idx++)));
}
- if (plugin->get_output_count() == 2) {
+ if (plugin->get_metadata_iface()->get_output_count() == 2) {
calf_vumeter_set_value(CALF_VUMETER(strip->audio_out[0]), LVL(plugin->get_level(idx++)));
calf_vumeter_set_value(CALF_VUMETER(strip->audio_out[1]), LVL(plugin->get_level(idx++)));
}
- if (plugin->get_midi()) {
+ if (plugin->get_metadata_iface()->get_midi()) {
calf_led_set_value (CALF_LED (strip->midi_in), plugin->get_level(idx++));
}
}
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list