projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add AudioBackendNativeThread to serve the same role as jack_native_thread_t
[ardour.git]
/
gtk2_ardour
/
midi_time_axis.cc
diff --git
a/gtk2_ardour/midi_time_axis.cc
b/gtk2_ardour/midi_time_axis.cc
index 3b8e4932fbde7bea9fc2f15ba10da55f92412388..a4ffc442a3f7414093be61da1ef2d90f5dd65a73 100644
(file)
--- a/
gtk2_ardour/midi_time_axis.cc
+++ b/
gtk2_ardour/midi_time_axis.cc
@@
-201,7
+201,7
@@
MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
v->pack_start (*manage (new Label ("")), true, true);
v->show ();
h->show ();
v->pack_start (*manage (new Label ("")), true, true);
v->show ();
h->show ();
- controls_hbox.pack_start(*v);
+ controls_hbox.pack_start(*v
, false, false
);
controls_ebox.set_name ("MidiTrackControlsBaseUnselected");
controls_base_selected_name = "MidiTrackControlsBaseSelected";
controls_ebox.set_name ("MidiTrackControlsBaseUnselected");
controls_base_selected_name = "MidiTrackControlsBaseSelected";
@@
-269,8
+269,11
@@
MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
_channel_status_box.set_spacing (6);
_channel_selector_button.set_label (_("Chns"));
_channel_status_box.set_spacing (6);
_channel_selector_button.set_label (_("Chns"));
-
- /* fixed sized labels to prevent silly nonsense */
+ ARDOUR_UI::instance()->set_tip (_channel_selector_button, _("Click to edit channel settings"));
+
+ /* fixed sized labels to prevent silly nonsense (though obviously,
+ * they cause their own too)
+ */
_playback_channel_status.set_size_request (65, -1);
_capture_channel_status.set_size_request (60, -1);
_playback_channel_status.set_size_request (65, -1);
_capture_channel_status.set_size_request (60, -1);
@@
-514,7
+517,6
@@
MidiTimeAxisView::toggle_channel_selector ()
_channel_selector->set_default_channel_color ();
}
_channel_selector->set_default_channel_color ();
}
- _channel_selector->set_position (WIN_POS_MOUSE);
_channel_selector->show_all ();
} else {
_channel_selector->cycle_visibility ();
_channel_selector->show_all ();
} else {
_channel_selector->cycle_visibility ();
@@
-1483,13
+1485,13
@@
MidiTimeAxisView::playback_channel_mode_changed ()
{
switch (midi_track()->get_playback_channel_mode()) {
case AllChannels:
{
switch (midi_track()->get_playback_channel_mode()) {
case AllChannels:
- _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Play"), ("all")));
+ _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Play"),
_
("all")));
break;
case FilterChannels:
break;
case FilterChannels:
- _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Play"), ("some")));
+ _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Play"),
_
("some")));
break;
case ForceChannel:
break;
case ForceChannel:
- _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Play"), ("all"), ffs (midi_track()->get_playback_channel_mask())));
+ _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Play"),
_
("all"), ffs (midi_track()->get_playback_channel_mask())));
break;
}
}
break;
}
}
@@
-1499,13
+1501,13
@@
MidiTimeAxisView::capture_channel_mode_changed ()
{
switch (midi_track()->get_capture_channel_mode()) {
case AllChannels:
{
switch (midi_track()->get_capture_channel_mode()) {
case AllChannels:
- _capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Rec"), ("all")));
+ _capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Rec"),
_
("all")));
break;
case FilterChannels:
break;
case FilterChannels:
- _capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Rec"), ("some")));
+ _capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Rec"),
_
("some")));
break;
case ForceChannel:
break;
case ForceChannel:
- _capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Rec"), ("all"), ffs (midi_track()->get_capture_channel_mask())));
+ _capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Rec"),
_
("all"), ffs (midi_track()->get_capture_channel_mask())));
break;
}
}
break;
}
}