Eliminate circular dependency kludge for control_protocol/smpte.o.

git-svn-id: svn://localhost/ardour2/branches/3.0@8262 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 2 insertions, 519 deletions

diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index 4f53ed43ae..f555ed326a 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -30,7 +30,7 @@
 
 #include <jack/types.h>
 
-#include "control_protocol/timecode.h"
+#include "musictime/time.h"
 
 namespace ARDOUR {
 	class Session;
diff --git a/libs/surfaces/control_protocol/control_protocol/timecode.h b/libs/surfaces/control_protocol/control_protocol/timecode.h
deleted file mode 100644
index 6b04b70cc3..0000000000
--- a/libs/surfaces/control_protocol/control_protocol/timecode.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-	Copyright (C) 2006 Paul Davis
-	
-	This program is free software; you can redistribute it and/or modify it
-	under the terms of the GNU Lesser General Public License as published
-	by the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful, but WITHOUT
-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-	for more details.
-	
-	You should have received a copy of the GNU General Public License along
-	with this program; if not, write to the Free Software Foundation, Inc.,
-	675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef __ardour_timecode_h__
-#define __ardour_timecode_h__
-
-#include <ostream>
-#include <inttypes.h>
-
-namespace Timecode {
-
-enum Wrap {
-	NONE = 0,
-	FRAMES,
-	SECONDS,
-	MINUTES,
-	HOURS
-};
-
-struct Time {
-	bool       negative;
-	uint32_t   hours;
-	uint32_t   minutes;
-	uint32_t   seconds;
-	uint32_t   frames;        ///< Timecode frames (not audio samples)
-	uint32_t   subframes;     ///< Typically unused
-	float      rate;          ///< Frame rate of this Time
-	static float default_rate;///< Rate to use for default constructor
-	bool       drop;          ///< Whether this Time uses dropframe Timecode
-
-	Time(float a_rate = default_rate) {
-		negative = false;
-		hours = 0;
-		minutes = 0;
-		seconds = 0;
-		frames = 0;
-		subframes = 0;
-		rate = a_rate;
-	}
-
-        std::ostream& print (std::ostream& ostr) const {
-		if (negative) {
-			ostr << '-';
-		}
-		ostr << hours << ':' << minutes << ':' << seconds << ':' << frames << '.' << subframes << " @" << rate << (drop ? " drop" : " nondrop");
-		return ostr;
-	}
-
-};
-
-Wrap increment( Time& timecode, uint32_t );
-Wrap decrement( Time& timecode, uint32_t );
-Wrap increment_subframes( Time& timecode, uint32_t );
-Wrap decrement_subframes( Time& timecode, uint32_t );
-Wrap increment_seconds( Time& timecode, uint32_t );
-Wrap increment_minutes( Time& timecode, uint32_t );
-Wrap increment_hours( Time& timecode, uint32_t );
-void frames_floor( Time& timecode );
-void seconds_floor( Time& timecode );
-void minutes_floor( Time& timecode );
-void hours_floor( Time& timecode );
-
-} // namespace Timecode
-
-std::ostream& operator<<(std::ostream& ostr, const Timecode::Time& t);
-
-#endif  // __ardour_timecode_h__
diff --git a/libs/surfaces/control_protocol/smpte.cc b/libs/surfaces/control_protocol/smpte.cc
deleted file mode 100644
index 10edd62542..0000000000
--- a/libs/surfaces/control_protocol/smpte.cc
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
-	Copyright (C) 2006 Paul Davis
-	
-	This program is free software; you can redistribute it and/or modify it
-	under the terms of the GNU Lesser General Public License as published
-	by the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful, but WITHOUT
-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-	for more details.
-	
-	You should have received a copy of the GNU General Public License along
-	with this program; if not, write to the Free Software Foundation, Inc.,
-	675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#define Timecode_IS_AROUND_ZERO( sm ) (!(sm).frames && !(sm).seconds && !(sm).minutes && !(sm).hours)
-#define Timecode_IS_ZERO( sm ) (!(sm).frames && !(sm).seconds && !(sm).minutes && !(sm).hours && !(sm.subframes))
-
-#include "control_protocol/timecode.h"
-#include "ardour/rc_configuration.h"
-
-namespace Timecode {
-
-float Time::default_rate = 30.0;
-
-
-/** Increment @a timecode by exactly one frame (keep subframes value).
- * Realtime safe.
- * @return true if seconds wrap.
- */
-Wrap
-increment( Time& timecode, uint32_t subframes_per_frame )
-{
-	Wrap wrap = NONE;
-
-	if (timecode.negative) {
-		if (Timecode_IS_AROUND_ZERO(timecode) && timecode.subframes) {
-			// We have a zero transition involving only subframes
-			timecode.subframes = subframes_per_frame - timecode.subframes;
-			timecode.negative = false;
-			return SECONDS;
-		}
-    
-		timecode.negative = false;
-		wrap = decrement( timecode, subframes_per_frame );
-		if (!Timecode_IS_ZERO( timecode )) {
-			timecode.negative = true;
-		}
-		return wrap;
-	}
-
-	switch ((int)ceil(timecode.rate)) {
-	case 24:
-		if (timecode.frames == 23) {
-			timecode.frames = 0;
-			wrap = SECONDS;
-		}
-		break;
-	case 25:
-		if (timecode.frames == 24) {
-			timecode.frames = 0;
-			wrap = SECONDS;
-		}
-		break;
-	case 30:
-	        if (timecode.drop) {
-		       if (timecode.frames == 29) {
-			      if ( ((timecode.minutes + 1) % 10) && (timecode.seconds == 59) ) {
-				     timecode.frames = 2;
-			      }
-			      else {
-				     timecode.frames = 0;
-			      }
-			      wrap = SECONDS;
-		       }
-		} else {
-
-		       if (timecode.frames == 29) {
-			      timecode.frames = 0;
-			      wrap = SECONDS;
-		       }
-		}
-		break;
-	case 60:
-	        if (timecode.frames == 59) {
-		        timecode.frames = 0;
-			wrap = SECONDS;
-		}
-		break;
-	}
-  
-	if (wrap == SECONDS) {
-		if (timecode.seconds == 59) {
-			timecode.seconds = 0;
-			wrap = MINUTES;
-			if (timecode.minutes == 59) {
-				timecode.minutes = 0;
-				wrap = HOURS;
-				timecode.hours++;
-			} else {
-				timecode.minutes++;
-			}
-		} else {
-			timecode.seconds++;
-		}
-	} else {
-		timecode.frames++;
-	}
-  
-	return wrap;
-}
-
-
-/** Decrement @a timecode by exactly one frame (keep subframes value)
- * Realtime safe.
- * @return true if seconds wrap. */
-Wrap
-decrement( Time& timecode, uint32_t subframes_per_frame )
-{
-	Wrap wrap = NONE;
-  
-  
-	if (timecode.negative || Timecode_IS_ZERO(timecode)) {
-		timecode.negative = false;
-		wrap = increment( timecode, subframes_per_frame );
-		timecode.negative = true;
-		return wrap;
-	} else if (Timecode_IS_AROUND_ZERO(timecode) && timecode.subframes) {
-		// We have a zero transition involving only subframes
-		timecode.subframes = subframes_per_frame - timecode.subframes;
-		timecode.negative = true;
-		return SECONDS;
-	}
-  
-	switch ((int)ceil(timecode.rate)) {
-	case 24:
-		if (timecode.frames == 0) {
-			timecode.frames = 23;
-			wrap = SECONDS;
-		}
-		break;
-	case 25:
-		if (timecode.frames == 0) {
-			timecode.frames = 24;
-			wrap = SECONDS;
-		}
-		break;
-	case 30:
-	        if (timecode.drop) {
-		        if ((timecode.minutes % 10) && (timecode.seconds == 0)) {
-			        if (timecode.frames <= 2) {
-				        timecode.frames = 29;
-					wrap = SECONDS;
-				}
-			} else if (timecode.frames == 0) {
-			        timecode.frames = 29;
-				wrap = SECONDS;
-			}
-			
-		} else {
-		        if (timecode.frames == 0) {
-			        timecode.frames = 29;
-				wrap = SECONDS;
-			}
-		}
-		break;
-	case 60:
-	        if (timecode.frames == 0) {
-		        timecode.frames = 59;
-			wrap = SECONDS;
-		}
-		break;
-	}
-  
-	if (wrap == SECONDS) {
-		if (timecode.seconds == 0) {
-			timecode.seconds = 59;
-			wrap = MINUTES;
-			if (timecode.minutes == 0) {
-				timecode.minutes = 59;
-				wrap = HOURS;
-				timecode.hours--;
-			}
-			else {
-				timecode.minutes--;
-			}
-		} else {
-			timecode.seconds--;
-		}
-	} else {
-		timecode.frames--;
-	}
-  
-	if (Timecode_IS_ZERO( timecode )) {
-		timecode.negative = false;
-	}
-  
-	return wrap;
-}
-
-
-/** Go to lowest absolute subframe value in this frame (set to 0 :-) ) */
-void
-frames_floor( Time& timecode )
-{
-	timecode.subframes = 0;
-	if (Timecode_IS_ZERO(timecode)) {
-		timecode.negative = false;
-	}
-}
-
-
-/** Increment @a timecode by one subframe */
-Wrap
-increment_subframes( Time& timecode, uint32_t subframes_per_frame )
-{
-	Wrap wrap = NONE;
-  
-	if (timecode.negative) {
-		timecode.negative = false;
-		wrap = decrement_subframes( timecode, subframes_per_frame );
-		if (!Timecode_IS_ZERO(timecode)) {
-			timecode.negative = true;
-		}
-		return wrap;
-	}
-  
-	timecode.subframes++;
-	if (timecode.subframes >= subframes_per_frame) {
-		timecode.subframes = 0;
-		increment( timecode, subframes_per_frame );
-		return FRAMES;
-	}
-	return NONE;
-}
-
-
-/** Decrement @a timecode by one subframe */
-Wrap
-decrement_subframes( Time& timecode, uint32_t subframes_per_frame )
-{
-	Wrap wrap = NONE;
-  
-	if (timecode.negative) {
-		timecode.negative = false;
-		wrap = increment_subframes( timecode, subframes_per_frame );
-		timecode.negative = true;
-		return wrap;
-	}
-  
-	if (timecode.subframes <= 0) {
-		timecode.subframes = 0;
-		if (Timecode_IS_ZERO(timecode)) {
-			timecode.negative = true;
-			timecode.subframes = 1;
-			return FRAMES;
-		} else {
-			decrement( timecode, subframes_per_frame );
-			timecode.subframes = 79;
-			return FRAMES;
-		}
-	} else {
-		timecode.subframes--;
-		if (Timecode_IS_ZERO(timecode)) {
-			timecode.negative = false;
-		}
-		return NONE;
-	}
-}
-
-
-/** Go to next whole second (frames == 0 or frames == 2) */
-Wrap
-increment_seconds( Time& timecode, uint32_t subframes_per_frame )
-{
-	Wrap wrap = NONE;
-  
-	// Clear subframes
-	frames_floor( timecode );
-  
-	if (timecode.negative) {
-		// Wrap second if on second boundary
-		wrap = increment(timecode, subframes_per_frame);
-		// Go to lowest absolute frame value
-		seconds_floor( timecode );
-		if (Timecode_IS_ZERO(timecode)) {
-			timecode.negative = false;
-		}
-	} else {
-		// Go to highest possible frame in this second
-	  switch ((int)ceil(timecode.rate)) {
-		case 24:
-			timecode.frames = 23;
-			break;
-		case 25:
-			timecode.frames = 24;
-			break;
-		case 30:
-			timecode.frames = 29;
-			break;
-		case 60:
-			timecode.frames = 59;
-			break;
-		}
-    
-		// Increment by one frame
-		wrap = increment( timecode, subframes_per_frame );
-	}
-  
-	return wrap;
-}
-
-
-/** Go to lowest (absolute) frame value in this second
- * Doesn't care about positive/negative */
-void
-seconds_floor( Time& timecode )
-{
-	// Clear subframes
-	frames_floor( timecode );
-  
-	// Go to lowest possible frame in this second
-	switch ((int)ceil(timecode.rate)) {
-	case 24:
-	case 25:
-	case 30:
-	case 60:
-	        if (!(timecode.drop)) {
-		        timecode.frames = 0;
-		} else {
-
-		        if ((timecode.minutes % 10) && (timecode.seconds == 0)) {
-			        timecode.frames = 2;
-			} else {
-			        timecode.frames = 0;
-			}
-		}
-		break;
-	}
-  
-	if (Timecode_IS_ZERO(timecode)) {
-		timecode.negative = false;
-	}
-}
-
-
-/** Go to next whole minute (seconds == 0, frames == 0 or frames == 2) */
-Wrap
-increment_minutes( Time& timecode, uint32_t subframes_per_frame )
-{
-	Wrap wrap = NONE;
-  
-	// Clear subframes
-	frames_floor( timecode );
-  
-	if (timecode.negative) {
-		// Wrap if on minute boundary
-		wrap = increment_seconds( timecode, subframes_per_frame );
-		// Go to lowest possible value in this minute
-		minutes_floor( timecode );
-	} else {
-		// Go to highest possible second
-		timecode.seconds = 59;
-		// Wrap minute by incrementing second
-		wrap = increment_seconds( timecode, subframes_per_frame );
-	}
-  
-	return wrap;
-}
-
-
-/** Go to lowest absolute value in this minute */
-void
-minutes_floor( Time& timecode )
-{
-	// Go to lowest possible second
-	timecode.seconds = 0;
-	// Go to lowest possible frame
-	seconds_floor( timecode );
-
-	if (Timecode_IS_ZERO(timecode)) {
-		timecode.negative = false;
-	}
-}
-
-
-/** Go to next whole hour (minute = 0, second = 0, frame = 0) */
-Wrap
-increment_hours( Time& timecode, uint32_t subframes_per_frame )
-{
-	Wrap wrap = NONE;
-  
-	// Clear subframes
-	frames_floor(timecode);
-  
-	if (timecode.negative) {
-		// Wrap if on hour boundary
-		wrap = increment_minutes( timecode, subframes_per_frame );
-		// Go to lowest possible value in this hour
-		hours_floor( timecode );
-	} else {
-		timecode.minutes = 59;
-		wrap = increment_minutes( timecode, subframes_per_frame );
-	}
-  
-	return wrap;
-}
-
-
-/** Go to lowest absolute value in this hour */
-void
-hours_floor( Time& timecode )
-{
-	timecode.minutes = 0;
-	timecode.seconds = 0;
-	timecode.frames = 0;
-	timecode.subframes = 0;
-  
-	if (Timecode_IS_ZERO(timecode)) {
-		timecode.negative = false;
-	}
-}
-
-
-} // namespace Timecode
-
-std::ostream& 
-operator<<(std::ostream& ostr, const Timecode::Time& t) 
-{
-	return t.print (ostr);
-}
diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index b118ca5726..00c9613c77 100644
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -24,14 +24,13 @@ def build(bld):
 	obj.source = '''
 		basic_ui.cc
 		control_protocol.cc
-		smpte.cc
 	'''
 	obj.export_incdirs = ['.', './control_protocol' ]
 	obj.cxxflags     = '-DPACKAGE="ardour_cp"'
 	obj.includes     = ['.', './control_protocol']
 	obj.name         = 'libardour_cp'
 	obj.target       = 'ardourcp'
-	obj.uselib_local = 'libardour'
+	obj.uselib_local = 'libardour libmusictime'
 	obj.vnum         = LIBARDOUR_CP_LIB_VERSION
 	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')