diff options
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/timecode.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 2 | ||||
| -rw-r--r-- | libs/ardour/wscript | 6 |
3 files changed, 2 insertions, 8 deletions
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 ' |