ardour/livetrax
13
0
Fork 0
Code

Tidy.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13914 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2013-01-20 02:49:07 +00:00
parent f7ada4b323
commit 511d68000c
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
gtk2_ardour/canvas_patch_change.cc
View File

@ -40,27 +40,27 @@ using namespace std;
/** @param x x position in pixels. /** @param x x position in pixels.
*/ */
CanvasPatchChange::CanvasPatchChange( CanvasPatchChange::CanvasPatchChange(
MidiRegionView& region, MidiRegionView& region,
Group& parent, Group& parent,
const string& text, const string& text,
double height, double height,
double x, double x,
double y, double y,
ARDOUR::InstrumentInfo& info, ARDOUR::InstrumentInfo& info,
ARDOUR::MidiModel::PatchChangePtr patch, ARDOUR::MidiModel::PatchChangePtr patch,
bool active_channel) bool active_channel)
: CanvasFlag( : CanvasFlag(
region, region,
parent, parent,
height, height,
active_channel ? active_channel ?
ARDOUR_UI::config()->canvasvar_MidiPatchChangeOutline.get() : ARDOUR_UI::config()->canvasvar_MidiPatchChangeOutline.get() :
ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelOutline.get(), ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelOutline.get(),
active_channel ? active_channel ?
ARDOUR_UI::config()->canvasvar_MidiPatchChangeFill.get() : ARDOUR_UI::config()->canvasvar_MidiPatchChangeFill.get() :
ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelFill.get(), ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelFill.get(),
x, x,
y) y)
, _info (info) , _info (info)
, _patch (patch) , _patch (patch)
, _popup_initialized(false) , _popup_initialized(false)
@ -104,9 +104,8 @@ CanvasPatchChange::initialize_popup_menus()
patch_menus.push_back( patch_menus.push_back(
Gtk::Menu_Helpers::MenuElem( Gtk::Menu_Helpers::MenuElem(
name, name,
sigc::bind( sigc::bind(sigc::mem_fun(*this, &CanvasPatchChange::on_patch_menu_selected),
sigc::mem_fun(*this, &CanvasPatchChange::on_patch_menu_selected), (*patch)->patch_primary_key())) );
(*patch)->patch_primary_key())) );
} }
std::string name = (*bank)->name(); std::string name = (*bank)->name();
@ -129,10 +128,11 @@ CanvasPatchChange::initialize_popup_menus()
std::string name = (*patch)->name(); std::string name = (*patch)->name();
boost::replace_all (name, "_", " "); boost::replace_all (name, "_", " ");
patch_menus.push_back (Gtk::Menu_Helpers::MenuElem (name, patch_menus.push_back (
sigc::bind ( Gtk::Menu_Helpers::MenuElem (
sigc::mem_fun(*this, &CanvasPatchChange::on_patch_menu_selected), name,
(*patch)->patch_primary_key()))); sigc::bind (sigc::mem_fun(*this, &CanvasPatchChange::on_patch_menu_selected),
(*patch)->patch_primary_key())));
} }
} }
} }
@ -235,12 +235,12 @@ CanvasPatchChange::on_event (GdkEvent* ev)
case GDK_ENTER_NOTIFY: case GDK_ENTER_NOTIFY:
_region.patch_entered (this); _region.patch_entered (this);
return true; return true;
break; break;
case GDK_LEAVE_NOTIFY: case GDK_LEAVE_NOTIFY:
_region.patch_left (this); _region.patch_left (this);
return true; return true;
break; break;
default: default: