Remove unused sources & includes

25 files changed, 5 insertions, 44 deletions

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 937328e323..80baef517c 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -55,8 +55,6 @@
 #include <gtkmm/adjustment.h>
 
 #include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/stateful_button.h"
-#include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/visibility_tracker.h"
 
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 3b633b297d..895bbe2066 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -35,7 +35,6 @@
 #include "pbd/basename.h"
 #include "pbd/fastlog.h"
 
-#include "gtkmm2ext/cairocell.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/window_title.h"
 
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index e43a16377e..3c5d065264 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -26,7 +26,6 @@
 #include <gtkmm/style.h>
 #include <sigc++/bind.h>
 
-#include "gtkmm2ext/cairocell.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/rgb_macros.h"
 
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 2567306a52..ae3c22b091 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -32,8 +32,6 @@
 #include "pbd/memento_command.h"
 
 #include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/selector.h"
-#include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/utils.h"
 
 #include "widgets/ardour_button.h"
diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index a5f8beffff..52c1a3d151 100644
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -28,7 +28,6 @@
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/checkmenuitem.h>
 
-#include <gtkmm2ext/selector.h>
 #include <list>
 
 #include "ardour/types.h"
diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index 632289bddf..2d96b17aa1 100644
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -30,7 +30,6 @@
 #include "pbd/i18n.h"
 
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/gtk_ui.h>
 
 #include "ardour/selection.h"
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 7ea217733b..58b731f293 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -58,9 +58,8 @@
 
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/eventboxext.h"
-#include "gtkmm2ext/grouped_buttons.h"
 #include "gtkmm2ext/gtk_ui.h"
-#include <gtkmm2ext/keyboard.h>
+#include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/window_title.h"
 #include "gtkmm2ext/choice.h"
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 382aa0be8c..ba1f989964 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -37,8 +37,6 @@
 #include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/dndtreeview.h"
 #include "gtkmm2ext/pane.h"
-#include "gtkmm2ext/selector.h"
-#include "gtkmm2ext/stateful_button.h"
 
 #include "pbd/stateful.h"
 #include "pbd/signals.h"
@@ -114,7 +112,6 @@ class EditorRoutes;
 class EditorRouteGroups;
 class EditorSnapshots;
 class EditorSummary;
-class GroupedButtons;
 class GUIObjectState;
 class ArdourMarker;
 class MidiRegionView;
diff --git a/gtk2_ardour/editor_route_groups.h b/gtk2_ardour/editor_route_groups.h
index 79b61a95fe..0a1df68b02 100644
--- a/gtk2_ardour/editor_route_groups.h
+++ b/gtk2_ardour/editor_route_groups.h
@@ -20,7 +20,6 @@
 #ifndef __gtk_ardour_editor_route_groups_h__
 #define __gtk_ardour_editor_route_groups_h__
 
-#include "gtkmm2ext/stateful_button.h"
 #include "editor_component.h"
 
 class EditorRouteGroups : public EditorComponent, public ARDOUR::SessionHandlePtr
diff --git a/gtk2_ardour/midi_channel_selector.h b/gtk2_ardour/midi_channel_selector.h
index 730e6de889..7f1281d7d0 100644
--- a/gtk2_ardour/midi_channel_selector.h
+++ b/gtk2_ardour/midi_channel_selector.h
@@ -29,6 +29,7 @@
 #include "gtkmm/button.h"
 #include "gtkmm/radiobutton.h"
 #include "gtkmm/label.h"
+
 #include "gtkmm2ext/stateful_button.h"
 
 #include "ardour/types.h"
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 63e7f90113..485c649810 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -35,8 +35,6 @@
 #include "pbd/stateful_diff_command.h"
 
 #include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/selector.h"
-#include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/utils.h"
 
 #include "widgets/tooltips.h"
diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 9319aa3ec9..8a899aece1 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -29,8 +29,6 @@
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/checkmenuitem.h>
 
-#include "gtkmm2ext/selector.h"
-
 #include "ardour/types.h"
 #include "ardour/region.h"
 
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 5d73bb641b..32a82fc2a6 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -32,7 +32,6 @@
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/choice.h"
 #include "gtkmm2ext/doi.h"
-#include "gtkmm2ext/bindable_button.h"
 
 #include "widgets/tooltips.h"
 
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 2e35481c57..850eb688e7 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -34,9 +34,6 @@
 #include <gtkmm/textview.h>
 #include <gtkmm/adjustment.h>
 
-#include "gtkmm2ext/bindable_button.h"
-#include "gtkmm2ext/stateful_button.h"
-
 #include "pbd/stateful.h"
 
 #include "ardour/types.h"
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index 4a01da2d30..ca0b23399d 100644
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -23,7 +23,6 @@
 #include "pbd/error.h"
 #include "pbd/replace_all.h"
 
-#include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/tearoff.h"
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/utils.h"
diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h
index a61f5a2fa5..ca85aa5457 100644
--- a/gtk2_ardour/monitor_section.h
+++ b/gtk2_ardour/monitor_section.h
@@ -21,7 +21,6 @@
 #include <gtkmm/table.h>
 #include <gtkmm/eventbox.h>
 
-#include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/bindings.h"
 
 #include "widgets/ardour_button.h"
diff --git a/gtk2_ardour/playlist_selector.h b/gtk2_ardour/playlist_selector.h
index 5db71a447f..d0b71a6265 100644
--- a/gtk2_ardour/playlist_selector.h
+++ b/gtk2_ardour/playlist_selector.h
@@ -26,7 +26,7 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/button.h>
 #include <gtkmm/treeview.h>
-#include <gtkmm2ext/selector.h>
+#include <gtkmm/treestore.h>
 
 #include "ardour_dialog.h"
 #include "ardour/session_handle.h"
diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h
index 8f4aec1304..548ed826ff 100644
--- a/gtk2_ardour/plugin_selector.h
+++ b/gtk2_ardour/plugin_selector.h
@@ -24,7 +24,6 @@
 #include <gtkmm/notebook.h>
 #include <gtkmm/treeview.h>
 #include "gtkmm2ext/dndtreeview.h"
-#include <gtkmm2ext/selector.h>
 
 #include "ardour/plugin.h"
 #include "ardour/session_handle.h"
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 62a68557ce..e4c48caf04 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -38,8 +38,6 @@
 #include "gtkmm/menu.h"
 #include "gtkmm/menuitem.h"
 #include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/selector.h"
-#include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/utils.h"
 
 #include "widgets/ardour_button.h"
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index f3f3c810a3..237f0b023f 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -32,8 +32,6 @@
 #include <gtkmm/checkmenuitem.h>
 #include <gtkmm/adjustment.h>
 
-#include <gtkmm2ext/selector.h>
-
 #include "widgets/ardour_button.h"
 
 #include "ardour/playlist.h"
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index ec71ffe28a..e5c4d196f5 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -23,7 +23,6 @@
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/choice.h"
 #include "gtkmm2ext/doi.h"
-#include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/utils.h"
 
@@ -1431,10 +1430,6 @@ RouteUI::build_solo_menu (void)
 	items.push_back (CheckMenuElem(*check));
 	solo_safe_check = dynamic_cast<Gtk::CheckMenuItem*>(&items.back());
 	check->show_all();
-
-	//items.push_back (SeparatorElem());
-	// items.push_back (MenuElem (_("MIDI Bind"), sigc::mem_fun (*mute_button, &BindableToggleButton::midi_learn)));
-
 }
 
 void
@@ -1471,9 +1466,6 @@ RouteUI::build_mute_menu(void)
 	items.push_back (CheckMenuElem(*main_mute_check));
 	main_mute_check->show_all();
 
-	//items.push_back (SeparatorElem());
-	// items.push_back (MenuElem (_("MIDI Bind"), sigc::mem_fun (*mute_button, &BindableToggleButton::midi_learn)));
-
 	_route->mute_points_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::muting_change, this), gui_context());
 }
 
diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index 98249bc62b..027a432593 100644
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -29,7 +29,6 @@
 
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/gui_thread.h"
-#include "gtkmm2ext/cairocell.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/rgb_macros.h"
 
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index bd81c766c4..bd41c8467d 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -31,7 +31,6 @@
 
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/selector.h>
 
 #include "canvas/canvas.h"
 #include "canvas/rectangle.h"
diff --git a/gtk2_ardour/time_info_box.cc b/gtk2_ardour/time_info_box.cc
index b60d9c1594..968e3ba9de 100644
--- a/gtk2_ardour/time_info_box.cc
+++ b/gtk2_ardour/time_info_box.cc
@@ -20,10 +20,8 @@
 #include <algorithm>
 #include "pbd/compose.h"
 
-#include "gtkmm2ext/cairocell.h"
 #include "gtkmm2ext/gui_thread.h"
 #include "gtkmm2ext/utils.h"
-#include "gtkmm2ext/stateful_button.h"
 #include "gtkmm2ext/actions.h"
 
 #include "ardour/location.h"
diff --git a/gtk2_ardour/time_info_box.h b/gtk2_ardour/time_info_box.h
index b705291a35..cf06b404c9 100644
--- a/gtk2_ardour/time_info_box.h
+++ b/gtk2_ardour/time_info_box.h
@@ -26,11 +26,11 @@
 #include <gtkmm/label.h>
 #include <gtkmm/table.h>
 
-#include "gtkmm2ext/cairo_packer.h"
-
 #include "ardour/ardour.h"
 #include "ardour/session_handle.h"
 
+#include "gtkmm2ext/cairo_packer.h"
+
 namespace ARDOUR {
 	class Session;
 	class Location;