allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Merge branch 'expvis' of https://github.com/mojofunk/ardour into exportvis

Browse Source
This commit is contained in:
Paul Davis
2013-12-05 12:19:01 -05:00
parent 5792674ca4 144f4cb423
commit c16551c808
13 changed files with 18 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/ardour/ardour/audio_backend.h
View File

@@ -32,14 +32,13 @@
#include "ardour/types.h"
#include "ardour/audioengine.h"
#include "ardour/port_engine.h"
#include "ardour/visibility.h"
#ifdef ARDOURBACKEND_DLL_EXPORTS // defined if we are building the ARDOUR Panners DLLs (instead of using them)
#define ARDOURBACKEND_API LIBARDOUR_HELPER_DLL_EXPORT
#define ARDOURBACKEND_API LIBARDOUR_DLL_EXPORT
#else
#define ARDOURBACKEND_API LIBARDOUR_HELPER_DLL_IMPORT
#define ARDOURBACKEND_API LIBARDOUR_DLL_IMPORT
#endif
#define ARDOURBACKEND_LOCAL LIBARDOUR_HELPER_DLL_LOCAL
#define ARDOURBACKEND_LOCAL LIBARDOUR_DLL_LOCAL
namespace ARDOUR {

7
libs/ardour/ardour/libardour_visibility.h
View File

@@ -20,12 +20,7 @@
#ifndef __libardour_libardour_visibility_h__
#define __libardour_libardour_visibility_h__
/* _WIN32 is defined by most compilers targetting Windows, but within the
* ardour source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
* on how a Windows build is built.
*/
#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
#if defined(COMPILER_MSVC)
#define LIBARDOUR_DLL_IMPORT __declspec(dllimport)
#define LIBARDOUR_DLL_EXPORT __declspec(dllexport)
#define LIBARDOUR_DLL_LOCAL

4
libs/ardour/ardour/session.h
View File

@@ -36,7 +36,7 @@
#include <glibmm/threads.h>
#include <ltc/ltc.h>
#include <ltc.h>
#include "pbd/error.h"
#include "pbd/event_loop.h"
@@ -141,7 +141,7 @@ class WindowsVSTPlugin;
extern void setup_enum_writer ();
class LIBARDOUR_API LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionList, public SessionEventManager
class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionList, public SessionEventManager
{
public:
enum RecordState {

2
libs/ardour/ardour/slave.h
View File

@@ -25,7 +25,7 @@
#include <glibmm/threads.h>
#include <jack/jack.h>
#include <ltc/ltc.h>
#include <ltc.h>
#include "pbd/signals.h"

38
libs/ardour/ardour/visibility.h
View File

@@ -1,38 +0,0 @@
/*
Copyright (C) 2013 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU 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 __libardour_visibility_h__
#define __libardour_visibility_h__
/* _WIN32 is defined by most compilers targetting Windows, but within the
* ardour source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
* on how a Windows build is built.
*/
#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
#define LIBARDOUR_HELPER_DLL_IMPORT __declspec(dllimport)
#define LIBARDOUR_HELPER_DLL_EXPORT __declspec(dllexport)
#define LIBARDOUR_HELPER_DLL_LOCAL
#else
#define LIBARDOUR_HELPER_DLL_IMPORT __attribute__ ((visibility ("default")))
#define LIBARDOUR_HELPER_DLL_EXPORT __attribute__ ((visibility ("default")))
#define LIBARDOUR_HELPER_DLL_LOCAL __attribute__ ((visibility ("hidden")))
#endif
#endif /* __libardour_visibility_h__ */

7
libs/ardour/wscript
View File

@@ -341,15 +341,14 @@ def build(bld):
'OSX','BOOST','CURL','DL']
obj.use = ['libpbd','libmidipp','libevoral', 'libvampplugin',
'libaudiographer',
'libltc_includes',
'libltc',
'libtimecode_includes',
]
if bld.is_defined('USE_EXTERNAL_LIBS'):
obj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'VAMPSDK',
obj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'VAMPSDK', 'LIBLTC',
'VAMPHOSTSDK'])
else:
obj.use.extend(['librubberband', 'libtaglib', 'libvamphost'])
obj.use.extend(['librubberband', 'libtaglib', 'libvamphost'
'libltc_includes', 'libltc'])
obj.vnum = LIBARDOUR_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')

7
libs/audiographer/audiographer/visibility.h
View File

@@ -20,12 +20,7 @@
#ifndef __libaudiographer_visibility_h__
#define __libaudiographer_visibility_h__
/* _WIN32 is defined by most compilers targetting Windows, but within the
* audiographer source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
* on how a Windows build is built.
*/
#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
#if defined(COMPILER_MSVC)
#define LIBAUDIOGRAPHER_DLL_IMPORT __declspec(dllimport)
#define LIBAUDIOGRAPHER_DLL_EXPORT __declspec(dllexport)
#define LIBAUDIOGRAPHER_DLL_LOCAL

7
libs/evoral/evoral/visibility.h
View File

@@ -20,12 +20,7 @@
#ifndef __libevoral_visibility_h__
#define __libevoral_visibility_h__
/* _WIN32 is defined by most compilers targetting Windows, but within the
* evoral source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
* on how a Windows build is built.
*/
#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
#if defined(COMPILER_MSVC)
#define LIBEVORAL_DLL_IMPORT __declspec(dllimport)
#define LIBEVORAL_DLL_EXPORT __declspec(dllexport)
#define LIBEVORAL_DLL_LOCAL

7
libs/gtkmm2ext/gtkmm2ext/visibility.h
View File

@@ -20,12 +20,7 @@
#ifndef __libgtkmm2ext_visibility_h__
#define __libgtkmm2ext_visibility_h__
/* _WIN32 is defined by most compilers targetting Windows, but within the
* gtkmm2ext source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
* on how a Windows build is built.
*/
#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
#if defined(COMPILER_MSVC)
#define LIBGTKMM2EXT_DLL_IMPORT __declspec(dllimport)
#define LIBGTKMM2EXT_DLL_EXPORT __declspec(dllexport)
#define LIBGTKMM2EXT_DLL_LOCAL

4
libs/libltc/wscript
View File

@@ -38,13 +38,13 @@ def configure(conf):
def build(bld):
if bld.is_defined('USE_EXTERNAL_LIBS'):
return
bld (export_includes = ['.'],
includes = ['.'],
bld (export_includes = ['ltc'],
name = 'libltc_includes'
)
bld.stlib (source = ['ltc.c', 'timecode.c', 'encoder.c', 'decoder.c'],
cflags = [ '-fPIC' ],
includes = ['.'],
target = 'libltc',
use = 'libltc_includes'
)

7
libs/midi++2/midi++/libmidi_visibility.h
View File

@@ -20,12 +20,7 @@
#ifndef __libmidi_libmidi_visibility_h__
#define __libmidi_libmidi_visibility_h__
/* _WIN32 is defined by most compilers targetting Windows, but within the
* midi source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
* on how a Windows build is built.
*/
#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
#if defined(COMPILER_MSVC)
#define LIBMIDIPP_DLL_IMPORT __declspec(dllimport)
#define LIBMIDIPP_DLL_EXPORT __declspec(dllexport)
#define LIBMIDIPP_DLL_LOCAL

7
libs/pbd/pbd/libpbd_visibility.h
View File

@@ -20,12 +20,7 @@
#ifndef __libpbd_libpbd_visibility_h__
#define __libpbd_libpbd_visibility_h__
/* _WIN32 is defined by most compilers targetting Windows, but within the
* ardour source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
* on how a Windows build is built.
*/
#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
#if defined(COMPILER_MSVC)
#define LIBPBD_DLL_IMPORT __declspec(dllimport)
#define LIBPBD_DLL_EXPORT __declspec(dllexport)
#define LIBPBD_DLL_LOCAL

7
libs/surfaces/control_protocol/control_protocol/visibility.h
View File

@@ -20,12 +20,7 @@
#ifndef __libcontrolcp_visibility_h__
#define __libcontrolcp_visibility_h__
/* _WIN32 is defined by most compilers targetting Windows, but within the
* controlcp source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
* on how a Windows build is built.
*/
#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
#if defined(COMPILER_MSVC)
#define LIBCONTROLCP_DLL_IMPORT __declspec(dllimport)
#define LIBCONTROLCP_DLL_EXPORT __declspec(dllexport)
#define LIBCONTROLCP_DLL_LOCAL