smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

Remove comments that clash with git merge markers

Browse source
This commit is contained in:
Robin Gareus 2021-12-13 22:51:42 +01:00
parent 28410ebb9a
commit 4f89834e7b
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk2_ardour/triggerbox_ui.cc
View file

@ -197,7 +197,6 @@ TriggerEntry::render (ArdourCanvas::Rect const & area, Cairo::RefPtr<Cairo::Cont
context->set_identity_matrix(); context->set_identity_matrix();
} }
{ {
//line at right //line at right
context->set_identity_matrix(); context->set_identity_matrix();
@ -304,10 +303,6 @@ TriggerEntry::ui_parameter_changed (std::string const& p)
} }
} }
/* ---------------------------- */
Gtkmm2ext::Bindings* TriggerBoxUI::bindings = 0; Gtkmm2ext::Bindings* TriggerBoxUI::bindings = 0;
Glib::RefPtr<Gtk::ActionGroup> TriggerBoxUI::trigger_actions; Glib::RefPtr<Gtk::ActionGroup> TriggerBoxUI::trigger_actions;
@ -814,9 +809,6 @@ TriggerBoxUI::rapid_update ()
} }
} }
/* ------------ */
TriggerBoxWidget::TriggerBoxWidget (TriggerBox& tb, float w, float h) : FittedCanvasWidget(w,h) TriggerBoxWidget::TriggerBoxWidget (TriggerBox& tb, float w, float h) : FittedCanvasWidget(w,h)
{ {
ui = new TriggerBoxUI (root(), tb); ui = new TriggerBoxUI (root(), tb);
@ -837,9 +829,6 @@ TriggerBoxWidget::on_unmap ()
ui->stop_updating (); ui->stop_updating ();
} }
/* ------------ */
TriggerBoxWindow::TriggerBoxWindow (TriggerBox& tb) TriggerBoxWindow::TriggerBoxWindow (TriggerBox& tb)
{ {
TriggerBoxWidget* tbw = manage (new TriggerBoxWidget (tb, -1., TriggerBox::default_triggers_per_box*16.)); TriggerBoxWidget* tbw = manage (new TriggerBoxWidget (tb, -1., TriggerBox::default_triggers_per_box*16.));