diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-14 12:22:18 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-14 12:22:18 -0500 |
| commit | e3329000557015ce54691235769db8821e75666b (patch) | |
| tree | 01d9adcd91e0026afd58eaf31499c391afcfbaa3 /libs | |
| parent | b3526d855e07a5819fd13842f6159180b9a018e4 (diff) | |
revert incorrect include path changes and removal of export macros for two libardour symbols (revision and ardour_config_info)
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/ardour.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/audiofile_tagger.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/revision.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/slave.h | 2 | ||||
| -rw-r--r-- | libs/ardour/audiofile_tagger.cc | 8 |
6 files changed, 10 insertions, 10 deletions
diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 5e747f5665..f21d62c6b7 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -68,7 +68,7 @@ namespace ARDOUR { extern LIBARDOUR_API PBD::PropertyChange bounds_change; - extern /*LIBARDOUR_API*/ const char* const ardour_config_info; + extern LIBARDOUR_API const char* const ardour_config_info; LIBARDOUR_API void find_bindings_files (std::map<std::string,std::string>&); diff --git a/libs/ardour/ardour/audiofile_tagger.h b/libs/ardour/ardour/audiofile_tagger.h index e2a8bb7235..88789f9036 100644 --- a/libs/ardour/ardour/audiofile_tagger.h +++ b/libs/ardour/ardour/audiofile_tagger.h @@ -24,8 +24,8 @@ #include <string> #include <taglib/tag.h> -#include <taglib/toolkit/taglib.h> -#include <taglib/ogg/xiphcomment.h> +#include <taglib/taglib.h> +#include <taglib/xiphcomment.h> #include "ardour/libardour_visibility.h" diff --git a/libs/ardour/ardour/revision.h b/libs/ardour/ardour/revision.h index 7374c0839b..ed4059cbf9 100644 --- a/libs/ardour/ardour/revision.h +++ b/libs/ardour/ardour/revision.h @@ -24,7 +24,7 @@ namespace ARDOUR { - /*LIBARDOUR_API extern*/ extern const char* revision; + LIBARDOUR_API extern const char* revision; extern "C" { LIBARDOUR_API const char* get_ardour_revision(); diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 71703b5c36..7295828d2f 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -36,7 +36,7 @@ #include <glibmm/threads.h> -#include "ltc/ltc.h" +#include <ltc.h> #include "pbd/error.h" #include "pbd/event_loop.h" diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 58685499e7..7e80055f94 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -25,7 +25,7 @@ #include <glibmm/threads.h> #include <jack/jack.h> -#include <ltc/ltc.h> +#include <ltc.h> #include "pbd/signals.h" diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc index 887366283c..61a05d49ce 100644 --- a/libs/ardour/audiofile_tagger.cc +++ b/libs/ardour/audiofile_tagger.cc @@ -25,11 +25,11 @@ #include "pbd/convert.h" #include <taglib/fileref.h> -#include <taglib/flac/flacfile.h> -#include <taglib/ogg/oggfile.h> +#include <taglib/flacfile.h> +#include <taglib/oggfile.h> #include <taglib/tag.h> -#include <taglib/toolkit/taglib.h> -#include <taglib/ogg/xiphcomment.h> +#include <taglib/taglib.h> +#include <taglib/xiphcomment.h> /* Convert string to TagLib::String */ #define TL_STR(string) TagLib::String ((string).c_str(), TagLib::String::UTF8) |