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

24 files changed, 29 insertions, 30 deletions

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index dba588702f..ba92416339 100644
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -74,7 +74,7 @@ namespace ARDOUR {
 	    const char* old;
 	};
 
-};
+}
 
 /* how do we make these be within the Ardour namespace? */
 
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index 60b40e3df2..0a0c908d31 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -443,6 +443,6 @@ class AudioDiskstream : public Stateful, public sigc::trackable
 	void disengage_record_enable (void* src);
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_diskstream_h__ */
diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index da12746c85..6cfb3ff3e3 100644
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -162,6 +162,6 @@ class AudioTrack : public Route
 	bool _destructive;
 };
 
-}; /* namespace ARDOUR*/
+} // namespace ARDOUR
 
 #endif /* __ardour_audio_track_h__ */
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index 50bf7dddcc..8db795ae90 100644
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -243,6 +243,6 @@ class AudioEngine : public sigc::trackable
     mutable gint     m_meter_exit;
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_audioengine_h__ */
diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 47c304f86e..eca2a3a0bc 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -150,7 +150,7 @@ class AudioFileSource : public AudioSource {
 	bool writable() const { return _flags & Writable; }
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_audiofilesource_h__ */
 
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 009aa4b5b0..d7bb0c916b 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -127,8 +127,7 @@ class AudioRegion : public Region
 		Fast,
 		Slow,
 		LogA,
-		LogB,
-
+		LogB
 	};
 
 	void set_fade_in_active (bool yn);
diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h
index cc4376f781..dd689e9a2d 100644
--- a/libs/ardour/ardour/configuration.h
+++ b/libs/ardour/ardour/configuration.h
@@ -99,6 +99,6 @@ class Configuration : public Stateful
 extern Configuration *Config;
 extern gain_t speed_quietning; /* see comment in configuration.cc */
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_configuration_h__ */
diff --git a/libs/ardour/ardour/curve.h b/libs/ardour/ardour/curve.h
index ede060e1cb..7f8a43cfe1 100644
--- a/libs/ardour/ardour/curve.h
+++ b/libs/ardour/ardour/curve.h
@@ -76,7 +76,7 @@ class Curve : public AutomationList
 
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 extern "C" {
 	void curve_get_vector_from_c (void *arg, double, double, float*, int32_t);
diff --git a/libs/ardour/ardour/export.h b/libs/ardour/ardour/export.h
index 9a6da1592b..075464767e 100644
--- a/libs/ardour/ardour/export.h
+++ b/libs/ardour/ardour/export.h
@@ -83,6 +83,6 @@ namespace ARDOUR
 	    int   status;
 
 	};
-};
+} // namespace ARDOUR
 
 #endif /* __ardour_export_h__ */
diff --git a/libs/ardour/ardour/insert.h b/libs/ardour/ardour/insert.h
index 2d6b672064..c8ae6d46b0 100644
--- a/libs/ardour/ardour/insert.h
+++ b/libs/ardour/ardour/insert.h
@@ -175,6 +175,6 @@ class PluginInsert : public Insert
 	Plugin* plugin_factory (Plugin&);
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_insert_h__ */
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 474d38a5bc..0356da8dc8 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -381,6 +381,6 @@ public:
 	int32_t find_output_port_hole ();
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /*__ardour_io_h__ */
diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index 2c9f947541..30c02a80a1 100644
--- a/libs/ardour/ardour/location.h
+++ b/libs/ardour/ardour/location.h
@@ -199,6 +199,6 @@ class Locations : public Stateful, public StateManager
 	StateManager::State* state_factory (std::string why) const;
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_location_h__ */
diff --git a/libs/ardour/ardour/logcurve.h b/libs/ardour/ardour/logcurve.h
index e65be55772..ac60a10fd7 100644
--- a/libs/ardour/ardour/logcurve.h
+++ b/libs/ardour/ardour/logcurve.h
@@ -126,7 +126,7 @@ class LogCurveOut : public LogCurve
 
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_logcurve_h__ */
 
diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index 37c985a2ef..75c59eb924 100644
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -312,6 +312,6 @@ class Panner : public std::vector<StreamPanner*>, public Stateful, public sigc::
 	static float current_automation_version_number;
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /*__ardour_panner_h__ */
diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index ff9c25e1c4..93ed2777e4 100644
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -208,6 +208,6 @@ class Port : public sigc::trackable {
 	static jack_nframes_t short_over_length;
 };
  
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_port_h__ */
diff --git a/libs/ardour/ardour/redirect.h b/libs/ardour/ardour/redirect.h
index ede55a1d80..8b08a41ce3 100644
--- a/libs/ardour/ardour/redirect.h
+++ b/libs/ardour/ardour/redirect.h
@@ -148,6 +148,6 @@ class Redirect : public IO
 	void* _gui;  /* generic, we don't know or care what this is */
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_redirect_h__ */
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 6f0ce0ae4a..8e4a094082 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -62,7 +62,7 @@ class Route : public IO
 	enum Flag {
 		Hidden = 0x1,
 		MasterOut = 0x2,
-		ControlOut = 0x4,
+		ControlOut = 0x4
 	};
 
 
@@ -352,6 +352,6 @@ class Route : public IO
 	void redirect_active_proxy (Redirect*, void*);
 };
 
-}; /* namespace ARDOUR*/
+} // namespace ARDOUR
 
 #endif /* __ardour_route_h__ */
diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h
index 19374b4f65..11253eda5b 100644
--- a/libs/ardour/ardour/route_group.h
+++ b/libs/ardour/ardour/route_group.h
@@ -43,7 +43,7 @@ class RouteGroup : public Stateful, public sigc::trackable {
     enum Flag {
 	    Relative = 0x1,
 	    Active = 0x2,
-	    Hidden = 0x4,
+	    Hidden = 0x4
     };
 
     RouteGroup (Session& s, const string &n, Flag f = Flag(0));
diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index 54d4cbd7a9..0a068e8af0 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -58,6 +58,6 @@ class Send : public Redirect {
 	uint32_t expected_inputs;
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_send_h__ */
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 68a79d7320..8b49af19d6 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -115,7 +115,7 @@ class Session : public sigc::trackable, public Stateful
 	enum SlaveSource {
 		None = 0,
 		MTC,
-		JACK,
+		JACK
 	};
 	
 	enum AutoConnectOption {
@@ -146,7 +146,7 @@ class Session : public sigc::trackable, public Stateful
 		    */
 
 		    StopOnce,
-		    AutoLoop,
+		    AutoLoop
 	    };
 
 	    enum Action {
@@ -1760,6 +1760,6 @@ class Session : public sigc::trackable, public Stateful
 	void remove_controllable (PBD::Controllable*);
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_session_h__ */
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 55a0e990a0..4764339451 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -75,7 +75,7 @@ class SndFileSource : public AudioFileSource {
 	int setup_broadcast_info (jack_nframes_t when, struct tm&, time_t);
 };
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __sndfile_source_h__ */
 
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 2c6cbe61e2..fa1d121d02 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -71,7 +71,7 @@ namespace ARDOUR {
 		PanAutomation = 0x2,
 		PluginAutomation = 0x4,
 		SoloAutomation = 0x8,
-		MuteAutomation = 0x10,
+		MuteAutomation = 0x10
 	};
 
 	enum AutoState {
@@ -190,7 +190,7 @@ namespace ARDOUR {
 
 	enum EditMode {
 		Slide,
-		Splice,
+		Splice
 	};
 
         enum RegionPoint { 
@@ -243,7 +243,7 @@ namespace ARDOUR {
 	    PeakDatum min;
 	    PeakDatum max;
 	};
-};
+}
 
 std::istream& operator>>(std::istream& o, ARDOUR::SampleFormat& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::HeaderFormat& sf);
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index a56424cfea..4984e13fa9 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -1179,7 +1179,7 @@ struct PanPlugins {
 PanPlugins pan_plugins[] = {
 	{ EqualPowerStereoPanner::name, 2, EqualPowerStereoPanner::factory },
 	{ Multi2dPanner::name, 3, Multi2dPanner::factory },
-	{ string (""), 0 }
+	{ string (""), 0, 0 }
 };
 
 XMLNode&
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index b6b9746c92..35d56760a9 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -2463,7 +2463,7 @@ remove_end(string* state)
 		statename = statename.substr (start+1);
 	}
 		
-	if ((end = statename.rfind(".ardour")) < 0) {
+	if ((end = statename.rfind(".ardour")) == string::npos) {
 		end = statename.length();
 	}