[SCM] calf/master: Comboboxes as LCD VU meters in rack with height New Logos
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:40:39 UTC 2013
The following commit has been merged in the master branch:
commit 01c7c5b6a72f8845d613226802e331171d4caa45
Author: Markus Schmidt <schmidt at boomshop.net>
Date: Sun Nov 20 04:57:57 2011 +0100
Comboboxes as LCD
VU meters in rack with height
New Logos
diff --git a/gui/blank.png b/gui/blank.png
new file mode 100644
index 0000000..c7cd8f8
Binary files /dev/null and b/gui/blank.png differ
diff --git a/gui/calf.rc.in b/gui/calf.rc.in
index 90577b0..73a1261 100644
--- a/gui/calf.rc.in
+++ b/gui/calf.rc.in
@@ -326,18 +326,18 @@ style "calf-button"
GtkButton ::child-displacement-y = 0
GtkButton ::inner-border = { 8, 8, 2, 2}
- xthickness = 5
- ythickness = 2
+ xthickness = 2
+ ythickness = 1
- fg[NORMAL] = "#146AB7"
+ fg[NORMAL] = "#0385CD"
fg[PRELIGHT] = "#49DBE8"
- fg[SELECTED] = "#146AB7"
+ fg[SELECTED] = "#0385CD"
fg[ACTIVE] = "#49DBE8"
fg[INSENSITIVE] = "#aaa"
- text[NORMAL] = "#146AB7"
+ text[NORMAL] = "#0385CD"
text[PRELIGHT] = "#49DBE8"
- text[SELECTED] = "#146AB7"
+ text[SELECTED] = "#0385CD"
text[ACTIVE] = "#49DBE8"
text[INSENSITIVE] = "#aaa"
@@ -409,18 +409,18 @@ style "calf-toggle"
GtkButton ::child-displacement-y = 0
GtkButton ::inner-border = { 8, 26, 2, 2}
- xthickness = 5
- ythickness = 2
+ xthickness = 2
+ ythickness = 1
- fg[NORMAL] = "#146AB7"
+ fg[NORMAL] = "#0385CD"
fg[PRELIGHT] = "#49DBE8"
- fg[SELECTED] = "#146AB7"
+ fg[SELECTED] = "#0385CD"
fg[ACTIVE] = "#49DBE8"
fg[INSENSITIVE] = "#aaa"
- text[NORMAL] = "#146AB7"
+ text[NORMAL] = "#0385CD"
text[PRELIGHT] = "#49DBE8"
- text[SELECTED] = "#146AB7"
+ text[SELECTED] = "#0385CD"
text[ACTIVE] = "#49DBE8"
text[INSENSITIVE] = "#aaa"
@@ -493,18 +493,18 @@ style "calf-button-norm"
GtkButton ::child-displacement-y = 0
GtkButton ::inner-border = { 8, 8, 2, 2}
- xthickness = 5
- ythickness = 2
+ xthickness = 2
+ ythickness = 1
- fg[NORMAL] = "#146AB7"
+ fg[NORMAL] = "#0385CD"
fg[PRELIGHT] = "#49DBE8"
- fg[SELECTED] = "#146AB7"
+ fg[SELECTED] = "#0385CD"
fg[ACTIVE] = "#49DBE8"
fg[INSENSITIVE] = "#aaa"
- text[NORMAL] = "#146AB7"
+ text[NORMAL] = "#0385CD"
text[PRELIGHT] = "#49DBE8"
- text[SELECTED] = "#146AB7"
+ text[SELECTED] = "#0385CD"
text[ACTIVE] = "#49DBE8"
text[INSENSITIVE] = "#aaa"
@@ -571,99 +571,163 @@ style "calf-button-norm"
style "calf-combobox"
{
- fg[NORMAL] = "#146AB7"
- fg[PRELIGHT] = "#49DBE8"
- fg[SELECTED] = "#146AB7"
- fg[ACTIVE] = "#49DBE8"
- fg[INSENSITIVE] = "#aaa"
-
- text[NORMAL] = "#146AB7"
- text[PRELIGHT] = "#49DBE8"
- text[SELECTED] = "#146AB7"
- text[ACTIVE] = "#49DBE8"
- text[INSENSITIVE] = "#aaa"
-
- bg[NORMAL] = "#DADADA"
- bg[PRELIGHT] = shade (1.4, "#D1D1D1")
- bg[ACTIVE] = shade (1.4, "#D1D1D1")
- bg[SELECTED] = "#DADADA"
- bg[INSENSITIVE] = shade (0.7, "#D1D1D1")
-
- base[NORMAL] = "#DADADA"
- base[PRELIGHT] = shade (1.4, "#D1D1D1")
- base[ACTIVE] = shade (1.4, "#D1D1D1")
- base[SELECTED] = "#DADADA"
- base[INSENSITIVE] = shade (0.7, "#D1D1D1")
+# fg[NORMAL] = "#0385CD"
+# fg[PRELIGHT] = "#49DBE8"
+# fg[SELECTED] = "#0385CD"
+# fg[ACTIVE] = "#49DBE8"
+# fg[INSENSITIVE] = "#aaa"
+#
+# text[NORMAL] = "#0385CD"
+# text[PRELIGHT] = "#49DBE8"
+# text[SELECTED] = "#0385CD"
+# text[ACTIVE] = "#49DBE8"
+# text[INSENSITIVE] = "#aaa"
+#
+# bg[NORMAL] = "#DADADA"
+# bg[PRELIGHT] = shade (1.4, "#D1D1D1")
+# bg[ACTIVE] = shade (1.4, "#D1D1D1")
+# bg[SELECTED] = "#DADADA"
+# bg[INSENSITIVE] = shade (0.7, "#D1D1D1")
+
+# base[NORMAL] = "#DADADA"
+# base[PRELIGHT] = shade (1.4, "#D1D1D1")
+# base[ACTIVE] = shade (1.4, "#D1D1D1")
+# base[SELECTED] = "#DADADA"
+# base[INSENSITIVE] = shade (0.7, "#D1D1D1")
GtkButton ::child-displacement-x = 0
GtkButton ::child-displacement-y = 0
# GtkButton ::default-border = { 6, 24, 5, 5 }
GtkButton ::inner-border = { 8, 29, 1, 1}
- xthickness = 5
- ythickness = 2
+ xthickness = 2
+ ythickness = 0
engine "pixmap"
{
image
+# {
+# function = BOX
+# recolorable = FALSE
+# state = PRELIGHT
+# file = "button_default_prelight.png"
+# border = {8, 24, 6, 6}
+# stretch = TRUE
+# }
+ {
+ function = BOX
+ recolorable = FALSE
+ state = PRELIGHT
+ file = "combo_active.png"
+ border = { 4, 4, 5, 4 }
+ stretch = TRUE
+ }
+ image
+# {
+# function = BOX
+# recolorable = FALSE
+# state = NORMAL
+# file = "button_default.png"
+# border = {8, 24, 6, 6}
+# stretch = TRUE
+# }
+ {
+ function = BOX
+ recolorable = FALSE
+ state = NORMAL
+ file = "combo.png"
+ border = { 4, 4, 5, 4 }
+ stretch = TRUE
+ }
+ image
+# {
+# function = BOX
+# recolorable = FALSE
+# state = ACTIVE
+# file = "button_default_active.png"
+# border = {8, 24, 6, 6}
+# stretch = TRUE
+# }
+ {
+ function = BOX
+ recolorable = FALSE
+ state = ACTIVE
+ file = "combo_active.png"
+ border = { 4, 4, 5, 4 }
+ stretch = TRUE
+ }
+ image
+# {
+# function = BOX
+# recolorable = FALSE
+# state = INSENSITIVE
+# file = "button_default.png"
+# border = {8, 24, 6, 6}
+# stretch = TRUE
+# }
+ {
+ function = BOX
+ recolorable = FALSE
+ state = INSENSITIVE
+ file = "combo_inactive.png"
+ border = { 4, 4, 5, 4 }
+ stretch = TRUE
+ }
+# image
+# {
+# function = ARROW
+# recolorable = FALSE
+# overlay_file = "null.png"
+# overlay_stretch = FALSE
+# }
+ # Arrows
+ image
{
- function = BOX
+ function = ARROW
+ state = INSENSITIVE
recolorable = FALSE
- state = PRELIGHT
- file = "button_default_prelight.png"
- border = {8, 24, 6, 6}
- stretch = TRUE
+ overlay_file = "combo_arrow.png"
+ overlay_stretch = FALSE
}
image
{
- function = BOX
+ function = ARROW
recolorable = FALSE
state = NORMAL
- file = "button_default.png"
- border = {8, 24, 6, 6}
- stretch = TRUE
+ overlay_file = "combo_arrow.png"
+ overlay_stretch = FALSE
}
-
image
{
- function = BOX
+ function = ARROW
recolorable = FALSE
state = ACTIVE
- file = "button_default_active.png"
- border = {8, 24, 6, 6}
- stretch = TRUE
+ overlay_file = "combo_arrow.png"
+ overlay_stretch = FALSE
}
image
{
- function = BOX
+ function = ARROW
recolorable = FALSE
- state = INSENSITIVE
- file = "button_default.png"
- border = {8, 24, 6, 6}
- stretch = TRUE
+ state = PRELIGHT
+ overlay_file = "combo_arrow.png"
+ overlay_stretch = FALSE
}
-# image
-# {
-# function = ARROW
-# recolorable = FALSE
-# overlay_file = "null.png"
-# overlay_stretch = FALSE
-# }
+
+ # Lines
image
{
function = VLINE
recolorable = FALSE
- file = "vline.png"
- border = { 1, 1, 0, 0 }
- stretch = TRUE
+ file = "blank.png"
+ stretch = FALSE
}
image
{
function = HLINE
recolorable = FALSE
- file = "hline.png"
- border = { 0, 0, 1, 1 }
- stretch = TRUE
+ file = "blank.png"
+ stretch = FALSE
}
}
}
@@ -684,6 +748,15 @@ style "calf-comboboxentry" = "calf-combobox"
style "calf-entry"
{
+ fg[NORMAL] = "#000"
+ fg[PRELIGHT] = "#000"
+ fg[ACTIVE] = "#000"
+ fg[INSENSITIVE] = "#aaa"
+
+ text[NORMAL] = "#000"
+ text[PRELIGHT] = "#000"
+ text[ACTIVE] = "#000"
+ text[INSENSITIVE] = "#000"
xthickness = 0
ythickness = 0
GtkEntry::shadow-type = GTK_SHADOW_NONE
diff --git a/gui/combo.png b/gui/combo.png
new file mode 100644
index 0000000..a90d7e3
Binary files /dev/null and b/gui/combo.png differ
diff --git a/gui/combo_active.png b/gui/combo_active.png
new file mode 100644
index 0000000..e8ac8de
Binary files /dev/null and b/gui/combo_active.png differ
diff --git a/gui/combo_arrow.png b/gui/combo_arrow.png
new file mode 100644
index 0000000..46fb0ea
Binary files /dev/null and b/gui/combo_arrow.png differ
diff --git a/gui/entry_inactive.png b/gui/combo_inactive.png
similarity index 53%
copy from gui/entry_inactive.png
copy to gui/combo_inactive.png
index c09dc4a..7933538 100644
Binary files a/gui/entry_inactive.png and b/gui/combo_inactive.png differ
diff --git a/gui/logo_button.png b/gui/logo_button.png
index 3fd87fb..efa01c5 100644
Binary files a/gui/logo_button.png and b/gui/logo_button.png differ
diff --git a/gui/side_e_logo.png b/gui/side_e_logo.png
index aeada3a..ebd928a 100644
Binary files a/gui/side_e_logo.png and b/gui/side_e_logo.png differ
diff --git a/src/calf/modules_limit.h b/src/calf/modules_limit.h
index 2c563ae..89cdb5f 100644
--- a/src/calf/modules_limit.h
+++ b/src/calf/modules_limit.h
@@ -51,6 +51,7 @@ public:
void params_changed();
uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask);
void set_sample_rate(uint32_t sr);
+ bool get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const;
};
};
diff --git a/src/gtk_main_win.cpp b/src/gtk_main_win.cpp
index a6e6d77..f767d30 100644
--- a/src/gtk_main_win.cpp
+++ b/src/gtk_main_win.cpp
@@ -340,7 +340,7 @@ gtk_main_window::plugin_strip *gtk_main_window::create_strip(plugin_ctl_iface *p
gtk_box_pack_start(GTK_BOX(midiBox), GTK_WIDGET(gtk_label_new("MIDI")), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(midiBox), GTK_WIDGET(label), TRUE, TRUE, 0);
gtk_table_attach(GTK_TABLE(strips_table), midiBox, 2, 3, row, row + 1, GTK_FILL, GTK_EXPAND, 5, 3);
- gtk_widget_set_size_request(GTK_WIDGET(label), 40, 36);
+ gtk_widget_set_size_request(GTK_WIDGET(label), 25, 25);
strip->midi_in = label;
gtk_widget_show_all(midiBox);
} else {
@@ -365,12 +365,14 @@ gtk_main_window::plugin_strip *gtk_main_window::create_strip(plugin_ctl_iface *p
label = calf_vumeter_new();
calf_vumeter_set_falloff(CALF_VUMETER(label), 2.5);
calf_vumeter_set_hold(CALF_VUMETER(label), 1.5);
+ calf_vumeter_set_height(CALF_VUMETER(label), 12);
gtk_box_pack_start(GTK_BOX(inBox), label,TRUE, TRUE, 0);
strip->audio_in[0] = label;
label = calf_vumeter_new();
calf_vumeter_set_falloff(CALF_VUMETER(label), 2.5);
calf_vumeter_set_hold(CALF_VUMETER(label), 1.5);
+ calf_vumeter_set_height(CALF_VUMETER(label), 12);
gtk_box_pack_start(GTK_BOX(inBox), label,TRUE, TRUE, 0);
strip->audio_in[1] = label;
@@ -389,12 +391,14 @@ gtk_main_window::plugin_strip *gtk_main_window::create_strip(plugin_ctl_iface *p
label = calf_vumeter_new();
calf_vumeter_set_falloff(CALF_VUMETER(label), 2.5);
calf_vumeter_set_hold(CALF_VUMETER(label), 1.5);
+ calf_vumeter_set_height(CALF_VUMETER(label), 12);
gtk_box_pack_start(GTK_BOX(outBox), label,TRUE, TRUE, 0);
strip->audio_out[0] = label;
label = calf_vumeter_new();
calf_vumeter_set_falloff(CALF_VUMETER(label), 2.5);
calf_vumeter_set_hold(CALF_VUMETER(label), 1.5);
+ calf_vumeter_set_height(CALF_VUMETER(label), 12);
gtk_box_pack_start(GTK_BOX(outBox), label,TRUE, TRUE, 0);
strip->audio_out[1] = label;
diff --git a/src/modules_limit.cpp b/src/modules_limit.cpp
index 4da8295..4a0e381 100644
--- a/src/modules_limit.cpp
+++ b/src/modules_limit.cpp
@@ -286,4 +286,22 @@ uint32_t multibandlimiter_audio_module::process(uint32_t offset, uint32_t numsam
return outputs_mask;
}
-
+bool multibandlimiter_audio_module::get_gridline(int index, int subindex, float &pos, bool &vertical, std::string &legend, cairo_iface *context) const
+{
+ bool tmp;
+ printf("%d\n", index);
+ vertical = (subindex & 1) != 0;
+ bool result = get_freq_gridline(subindex >> 1, pos, tmp, legend, context, false);
+ if (result && vertical) {
+ if ((subindex & 4) && !legend.empty()) {
+ legend = "";
+ }
+ else {
+ size_t pos = legend.find(" dB");
+ if (pos != std::string::npos)
+ legend.erase(pos);
+ }
+ pos = 0.5 + 0.5 * pos;
+ }
+ return result;
+}
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list