Eliminate circular dependency kludge for control_protocol/smpte.o.

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

13 files changed, 59 insertions, 17 deletions

diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index a551b050fc..51864cf6dc 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -16,7 +16,7 @@ fi
 
 export VAMP_PATH=$libs/vamp-plugins${VAMP_PATH:+:$VAMP_PATH}
 
-export LD_LIBRARY_PATH=$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/gnomecanvas:$libs/libsndfile:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/gnomecanvas:$libs/libsndfile:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/musictime:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 # DYLD_LIBRARY_PATH is for darwin.
 export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
diff --git a/libs/ardour/ardour/timecode.h b/libs/ardour/ardour/timecode.h
index 732a728c26..f0fb13b16f 100644
--- a/libs/ardour/ardour/timecode.h
+++ b/libs/ardour/ardour/timecode.h
@@ -19,6 +19,6 @@
 #ifndef __libardour_timecode_h__
 #define __libardour_timecode_h__
 
-#include "control_protocol/timecode.h"
+#include "musictime/time.h"
 
 #endif  // __libardour_timecode_h__
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 92739c3cd6..006ec447d7 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -30,7 +30,7 @@
 #include <inttypes.h>
 #include <jack/types.h>
 #include <jack/midiport.h>
-#include "control_protocol/timecode.h"
+#include "musictime/time.h"
 #include "pbd/id.h"
 
 #include "ardour/bbt_time.h"
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 346a350865..03e602ee5a 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -302,12 +302,6 @@ def build(bld):
 	#obj.uselib += ' SOUNDTOUCH '
 	#obj.add_objects = 'default/libs/surfaces/control_protocol/smpte_1.o'
 	
-	obj.env.append_value('LINKFLAGS', 'default/libs/surfaces/control_protocol/smpte_1.o')
-	#
-	#	TODO: The above is an ugly hack that shouldn't be needed.  We really need
-	#	to refactor SMPTE out of libardour_cp to get rid of that circular dependency
-	#	alltogether.
-	#
 	if bld.env['HAVE_SLV2']:
 		obj.source += [ 'lv2_plugin.cc', 'lv2_event_buffer.cc', 'uri_map.cc', 'lv2_pfile.c' ]
 		obj.uselib += ' SLV2 '
diff --git a/libs/midi++2/midi++/mmc.h b/libs/midi++2/midi++/mmc.h
index cc8891db2c..e6716e16f3 100644
--- a/libs/midi++2/midi++/mmc.h
+++ b/libs/midi++2/midi++/mmc.h
@@ -21,7 +21,7 @@
 #define __midipp_mmc_h_h__
 
 #include <jack/types.h>
-#include "control_protocol/timecode.h"
+#include "musictime/time.h"
 #include "pbd/signals.h"
 #include "pbd/ringbuffer.h"
 #include "midi++/types.h"
diff --git a/libs/midi++2/mmc.cc b/libs/midi++2/mmc.cc
index 31e0fdfa23..0275c0def3 100644
--- a/libs/midi++2/mmc.cc
+++ b/libs/midi++2/mmc.cc
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <map>
 
-#include "control_protocol/timecode.h"
+#include "musictime/time.h"
 #include "pbd/error.h"
 #include "midi++/mmc.h"
 #include "midi++/port.h"
diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index aa6f8a67ca..6c3d251a55 100644
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -62,7 +62,7 @@ def build(bld):
 	obj.name         = 'libmidipp'
 	obj.target       = 'midipp'
 	obj.uselib       = 'GLIBMM SIGCPP XML JACK OSX'
-	obj.uselib_local = 'libpbd libevoral'
+	obj.uselib_local = 'libpbd libevoral libmusictime'
 	obj.vnum         = LIBMIDIPP_LIB_VERSION
 	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
diff --git a/libs/surfaces/control_protocol/control_protocol/timecode.h b/libs/musictime/musictime/time.h
index 6b04b70cc3..6b04b70cc3 100644
--- a/libs/surfaces/control_protocol/control_protocol/timecode.h
+++ b/libs/musictime/musictime/time.h
diff --git a/libs/surfaces/control_protocol/smpte.cc b/libs/musictime/src/time.cc
index 10edd62542..8784a9017d 100644
--- a/libs/surfaces/control_protocol/smpte.cc
+++ b/libs/musictime/src/time.cc
@@ -19,8 +19,9 @@
 #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"
+#include <math.h>
+
+#include "musictime/time.h"
 
 namespace Timecode {
 
diff --git a/libs/musictime/wscript b/libs/musictime/wscript
new file mode 100644
index 0000000000..938ef6e7a0
--- /dev/null
+++ b/libs/musictime/wscript
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+import autowaf
+import Options
+import os
+
+# Version of this package (even if built as a child)
+MUSICTIME_VERSION = '0.0.0'
+
+# Library version (UNIX style major, minor, micro)
+# major increment <=> incompatible changes
+# minor increment <=> compatible changes (additions)
+# micro increment <=> no interface changes
+# Version history:
+#   0.0.0 = 0,0,0
+MUSICTIME_LIB_VERSION = '0.0.0'
+
+# Variables for 'waf dist'
+APPNAME = 'musictime'
+VERSION = MUSICTIME_VERSION
+
+# Mandatory variables
+srcdir = '.'
+blddir = 'build'
+
+def set_options(opt):
+	autowaf.set_options(opt)
+
+def configure(conf):
+	autowaf.configure(conf)
+
+	conf.check_tool('compiler_cxx')
+
+def build(bld):
+	# Library
+	obj = bld.new_task_gen('cxx', 'shlib')
+	obj.source         = 'src/time.cc'
+	obj.export_incdirs = ['.']
+	obj.includes       = ['.', './src']
+	obj.name           = 'libmusictime'
+	obj.target         = 'musictime'
+	obj.vnum           = MUSICTIME_LIB_VERSION
+	obj.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
+
+def shutdown():
+	autowaf.shutdown()
+
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/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')
 
diff --git a/wscript b/wscript
index 63b091d4fd..44192ad4ac 100644
--- a/wscript
+++ b/wscript
@@ -25,6 +25,7 @@ children = [
 	'libs/taglib',
 	'libs/rubberband',
 	'libs/surfaces',
+	'libs/musictime',
 	'libs/ardour',
 	'libs/gtkmm2ext',
 	'libs/clearlooks-newer',
@@ -582,6 +583,7 @@ def build(bld):
         bld.path.find_dir ('libs/evoral/evoral')
         bld.path.find_dir ('libs/vamp-sdk/vamp-sdk')
         bld.path.find_dir ('libs/surfaces/control_protocol/control_protocol')
+	bld.path.find_dir ('libs/musictime/musictime')
         bld.path.find_dir ('libs/rubberband/rubberband')
         bld.path.find_dir ('libs/gtkmm2ext/gtkmm2ext')
         bld.path.find_dir ('libs/ardour/ardour')