projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove references to connection manager from the build.
[ardour.git]
/
gtk2_ardour
/
canvas-program-change.cc
diff --git
a/gtk2_ardour/canvas-program-change.cc
b/gtk2_ardour/canvas-program-change.cc
index 24f13f26056f6b0041b49bbfc374cf846f77500f..d544d9d8aa21f1109e2f005feaeea8ff0f992fa5 100644
(file)
--- a/
gtk2_ardour/canvas-program-change.cc
+++ b/
gtk2_ardour/canvas-program-change.cc
@@
-1,5
+1,7
@@
#include <iostream>
#include <iostream>
+#include <glibmm/regex.h>
+
#include "ardour/midi_patch_manager.h"
#include "ardour_ui.h"
#include "midi_region_view.h"
#include "ardour/midi_patch_manager.h"
#include "ardour_ui.h"
#include "midi_region_view.h"
@@
-36,9
+38,9
@@
CanvasProgramChange::CanvasProgramChange(
, _event_time(event_time)
, _channel(channel)
, _program(program)
, _event_time(event_time)
, _channel(channel)
, _program(program)
+ , _popup_initialized(false)
{
set_text(text);
{
set_text(text);
- initialize_popup_menus();
}
CanvasProgramChange::~CanvasProgramChange()
}
CanvasProgramChange::~CanvasProgramChange()
@@
-64,6
+66,9
@@
CanvasProgramChange::initialize_popup_menus()
for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin();
bank != patch_banks.end();
++bank) {
for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin();
bank != patch_banks.end();
++bank) {
+ Glib::RefPtr<Glib::Regex> underscores = Glib::Regex::create("_");
+ Glib::ustring replacement(" ");
+
Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu());
const PatchBank::PatchNameList& patches = (*bank)->patch_name_list();
Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu());
const PatchBank::PatchNameList& patches = (*bank)->patch_name_list();
@@
-72,17
+77,22
@@
CanvasProgramChange::initialize_popup_menus()
for (PatchBank::PatchNameList::const_iterator patch = patches.begin();
patch != patches.end();
++patch) {
for (PatchBank::PatchNameList::const_iterator patch = patches.begin();
patch != patches.end();
++patch) {
+ Glib::ustring name = underscores->replace((*patch)->name().c_str(), -1, 0, replacement);
+
patch_menus.push_back(
Gtk::Menu_Helpers::MenuElem(
patch_menus.push_back(
Gtk::Menu_Helpers::MenuElem(
-
(*patch)->name()
,
+
name
,
sigc::bind(
sigc::mem_fun(*this, &CanvasProgramChange::on_patch_menu_selected),
(*patch)->patch_primary_key())) );
}
sigc::bind(
sigc::mem_fun(*this, &CanvasProgramChange::on_patch_menu_selected),
(*patch)->patch_primary_key())) );
}
+
+
+ Glib::ustring name = underscores->replace((*bank)->name().c_str(), -1, 0, replacement);
patch_bank_menus.push_back(
Gtk::Menu_Helpers::MenuElem(
patch_bank_menus.push_back(
Gtk::Menu_Helpers::MenuElem(
-
(*bank)->name()
,
+
name
,
patch_bank_menu) );
}
}
patch_bank_menu) );
}
}
@@
-100,6
+110,11
@@
CanvasProgramChange::on_event(GdkEvent* ev)
switch (ev->type) {
case GDK_BUTTON_PRESS:
if (ev->button.button == 3) {
switch (ev->type) {
case GDK_BUTTON_PRESS:
if (ev->button.button == 3) {
+ // lazy init
+ if (!_popup_initialized) {
+ initialize_popup_menus();
+ _popup_initialized = true;
+ }
_popup.popup(ev->button.button, ev->button.time);
return true;
}
_popup.popup(ev->button.button, ev->button.time);
return true;
}