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

NOOP, re-indent, remove trailing whitespace, sort includes

Browse source
This commit is contained in:
Robin Gareus 2014-09-07 20:11:28 +02:00
parent f23f379b37
commit 4167e83972
1 changed files with 195 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

46
gtk2_ardour/editor_routes.cc
View file

@ -17,37 +17,37 @@
*/ */
#include <cstdlib>
#include <cassert>
#include <cmath>
#include <list> #include <list>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <cstdlib>
#include <cmath>
#include <cassert>
#include "pbd/unknown_type.h" #include "pbd/unknown_type.h"
#include "pbd/unwind.h" #include "pbd/unwind.h"
#include "ardour/debug.h" #include "ardour/debug.h"
#include "ardour/route.h"
#include "ardour/midi_track.h" #include "ardour/midi_track.h"
#include "ardour/route.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "gtkmm2ext/cell_renderer_pixbuf_multi.h" #include "gtkmm2ext/cell_renderer_pixbuf_multi.h"
#include "gtkmm2ext/cell_renderer_pixbuf_toggle.h" #include "gtkmm2ext/cell_renderer_pixbuf_toggle.h"
#include "gtkmm2ext/treeutils.h" #include "gtkmm2ext/treeutils.h"
#include "editor.h" #include "actions.h"
#include "keyboard.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "audio_time_axis.h" #include "audio_time_axis.h"
#include "midi_time_axis.h" #include "editor.h"
#include "mixer_strip.h"
#include "gui_thread.h"
#include "actions.h"
#include "utils.h"
#include "route_sorter.h"
#include "editor_group_tabs.h" #include "editor_group_tabs.h"
#include "editor_routes.h" #include "editor_routes.h"
#include "gui_thread.h"
#include "keyboard.h"
#include "midi_time_axis.h"
#include "mixer_strip.h"
#include "route_sorter.h"
#include "utils.h"
#include "i18n.h" #include "i18n.h"
@ -328,7 +328,7 @@ EditorRoutes::enter_notify (GdkEventCrossing*)
} }
/* arm counter so that ::selection_filter() will deny selecting anything for the /* arm counter so that ::selection_filter() will deny selecting anything for the
next two attempts to change selection status. * next two attempts to change selection status.
*/ */
selection_countdown = 2; selection_countdown = 2;
_scroller.grab_focus (); _scroller.grab_focus ();
@ -572,13 +572,13 @@ void
EditorRoutes::row_deleted (Gtk::TreeModel::Path const &) EditorRoutes::row_deleted (Gtk::TreeModel::Path const &)
{ {
/* this happens as the second step of a DnD within the treeview, and /* this happens as the second step of a DnD within the treeview, and
when a route is actually removed. we don't differentiate between * when a route is actually removed. we don't differentiate between
the two cases. * the two cases.
*
note that the sync_orders_keys() step may not actually change any * note that the sync_orders_keys() step may not actually change any
RID's (e.g. the last track may be removed, so all other tracks keep * RID's (e.g. the last track may be removed, so all other tracks keep
the same RID), which means that no redisplay would happen. so we * the same RID), which means that no redisplay would happen. so we
have to force a redisplay. * have to force a redisplay.
*/ */
DEBUG_TRACE (DEBUG::OrderKeys, "editor routes treeview row deleted\n"); DEBUG_TRACE (DEBUG::OrderKeys, "editor routes treeview row deleted\n");
@ -1197,8 +1197,7 @@ EditorRoutes::key_press (GdkEventKey* ev)
case GDK_Tab: case GDK_Tab:
case GDK_ISO_Left_Tab: case GDK_ISO_Left_Tab:
/* If we appear to be editing something, leave that cleanly and appropriately. /* If we appear to be editing something, leave that cleanly and appropriately. */
*/
if (name_editable) { if (name_editable) {
name_editable->editing_done (); name_editable->editing_done ();
name_editable = 0; name_editable = 0;
@ -1367,7 +1366,8 @@ EditorRoutes::selection_filter (Glib::RefPtr<TreeModel> const &, TreeModel::Path
return true; return true;
} }
struct EditorOrderRouteSorter { struct EditorOrderRouteSorter
{
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) { bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
if (a->is_master()) { if (a->is_master()) {
/* master before everything else */ /* master before everything else */