smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 21:55:43 +01:00
Code Issues Projects Releases Wiki Activity

Revert unfinished export visibility commits by John Emmas

Browse source 
These break the mingw build and the visibility work will make this
code redundant
This commit is contained in:
Tim Mayberry 2013-10-21 20:41:24 +10:00
parent 796f39b967
commit e80d18b0b3
2 changed files with 2 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/session_event.h
View file

@ -36,7 +36,7 @@ namespace ARDOUR {
class Slave;
class Region;
class LIBARDOUR_API SessionEvent {
class SessionEvent {
public:
enum Type {
SetTransportSpeed,
@ -151,7 +151,7 @@ private:
friend class Butler;
};
class LIBARDOUR_API SessionEventManager {
class SessionEventManager {
public:
SessionEventManager () : pending_events (2048),
auto_loop_event(0), punch_out_event(0), punch_in_event(0) {}

30
libs/ardour/ardour/visibility.h
View file

@ -20,36 +20,6 @@
#ifndef __libardour_visibility_h__
#define __libardour_visibility_h__
#ifdef LIBARDOUR_IS_IN_WIN_STATIC_LIB // #define if your project uses libardour (under Windows) as a static library
#define LIBARDOUR_IS_IN_WINDLL 0
#endif
#if !defined(LIBARDOUR_IS_IN_WINDLL)
#if defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
// If you need '__declspec' compatibility, add extra compilers to the above as necessary
#define LIBARDOUR_IS_IN_WINDLL 1
#else
#define LIBARDOUR_IS_IN_WINDLL 0
#endif
#endif
#if LIBARDOUR_IS_IN_WINDLL && !defined(LIBARDOUR_API)
#if defined(BUILDING_LIBARDOUR)
#define LIBARDOUR_API __declspec(dllexport)
#define LIBARDOUR_APICALLTYPE __cdecl
#elif defined(COMPILER_MSVC) || defined(COMPILER_MINGW) // Probably needs Cygwin too, at some point
#define LIBARDOUR_API __declspec(dllimport)
#define LIBARDOUR_APICALLTYPE __cdecl
#else
#error "Attempting to define __declspec with an incompatible compiler !"
#endif
#elif !defined(LIBARDOUR_API)
// Other compilers / platforms could be accommodated here (as an example, see LIBARDOUR_HELPER_DLL, below)
#define LIBARDOUR_API
#define LIBARDOUR_APICALLTYPE
#endif
/* _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.