Removed unused midicontrollable.cc

Enum and namespace syntax fixes to satisfy -pedantic
Resolved a couple "code never reached" areas to satisfy -Wextra


git-svn-id: svn://localhost/ardour2/trunk@688 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 9 insertions, 8 deletions

diff --git a/gtk2_ardour/ardour_dialog.h b/gtk2_ardour/ardour_dialog.h
index a23dcda9e0..069768c143 100644
--- a/gtk2_ardour/ardour_dialog.h
+++ b/gtk2_ardour/ardour_dialog.h
@@ -26,7 +26,7 @@
 
 namespace ARDOUR {
 	class Session;
-};
+}
 
 /*
  * This virtual parent class is so that each dialog box uses the
@@ -55,3 +55,4 @@ class ArdourDialog : public Gtk::Dialog
 };
 
 #endif // __ardour_dialog_h__
+
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index e9fae63677..5fb9dd95e7 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -79,7 +79,7 @@ class ColorManager;
 
 namespace Gtkmm2ext {
 	class TearOff;
-};
+}
 
 namespace ARDOUR {
 	class AudioEngine;
@@ -87,11 +87,11 @@ namespace ARDOUR {
 	class Port;
 	class IO;
 	class ControlProtocolInfo;
-};
+}
 
 namespace ALSA {
 	class MultiChannelDevice;
-};
+}
 
 #define FRAME_NAME "BaseFrame"
 
@@ -707,5 +707,5 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void toggle_control_protocol (ARDOUR::ControlProtocolInfo*);
 };
 
-
 #endif /* __ardour_gui_h__ */
+
diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h
index 14dc6ba673..9ff5f45ddf 100644
--- a/gtk2_ardour/audio_clock.h
+++ b/gtk2_ardour/audio_clock.h
@@ -30,7 +30,7 @@
 
 namespace ARDOUR {
 	class Session;
-};
+}
 
 class AudioClock : public Gtk::HBox
 {
@@ -40,7 +40,7 @@ class AudioClock : public Gtk::HBox
 		BBT,
 		MinSec,
 		Frames,
-		Off,
+		Off
 	};
 	
 	AudioClock (const string& name, bool editable, bool is_duration = false, bool with_tempo_meter = false);
@@ -87,7 +87,7 @@ class AudioClock : public Gtk::HBox
 		Bars,
 		Beats, 
 		Ticks,
-		AudioFrames,
+		AudioFrames
 	};
 
 	Gtk::EventBox  audio_frames_ebox;