mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-19 13:16:27 +01:00
merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.
Still need to add API export/visibility macros for the canvas library.
This commit is contained in:
commit
b0e4f81eb3
426 changed files with 2059 additions and 1259 deletions
|
|
@ -32,12 +32,14 @@
|
|||
|
||||
#include "timecode/time.h"
|
||||
|
||||
#include "control_protocol/visibility.h"
|
||||
|
||||
namespace ARDOUR {
|
||||
class Session;
|
||||
class SessionEvent;
|
||||
}
|
||||
|
||||
class BasicUI {
|
||||
class LIBCONTROLCP_API BasicUI {
|
||||
public:
|
||||
BasicUI (ARDOUR::Session&);
|
||||
virtual ~BasicUI ();
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
#include "pbd/stateful.h"
|
||||
#include "pbd/signals.h"
|
||||
|
||||
#include "control_protocol/visibility.h"
|
||||
#include "control_protocol/basic_ui.h"
|
||||
#include "control_protocol/types.h"
|
||||
|
||||
|
|
@ -39,7 +40,7 @@ class Route;
|
|||
class Session;
|
||||
class Bundle;
|
||||
|
||||
class ControlProtocol : public PBD::Stateful, public PBD::ScopedConnectionList, public BasicUI
|
||||
class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::ScopedConnectionList, public BasicUI
|
||||
{
|
||||
public:
|
||||
ControlProtocol (Session&, std::string name);
|
||||
|
|
|
|||
45
libs/surfaces/control_protocol/control_protocol/visibility.h
Normal file
45
libs/surfaces/control_protocol/control_protocol/visibility.h
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
/*
|
||||
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 __libcontrolcp_visibility_h__
|
||||
#define __libcontrolcp_visibility_h__
|
||||
|
||||
#if defined(COMPILER_MSVC)
|
||||
#define LIBCONTROLCP_DLL_IMPORT __declspec(dllimport)
|
||||
#define LIBCONTROLCP_DLL_EXPORT __declspec(dllexport)
|
||||
#define LIBCONTROLCP_DLL_LOCAL
|
||||
#else
|
||||
#define LIBCONTROLCP_DLL_IMPORT __attribute__ ((visibility ("default")))
|
||||
#define LIBCONTROLCP_DLL_EXPORT __attribute__ ((visibility ("default")))
|
||||
#define LIBCONTROLCP_DLL_LOCAL __attribute__ ((visibility ("hidden")))
|
||||
#endif
|
||||
|
||||
#ifdef LIBCONTROLCP_STATIC // libcontrolcp is not a DLL
|
||||
#define LIBCONTROLCP_API
|
||||
#define LIBCONTROLCP_LOCAL
|
||||
#else
|
||||
#ifdef LIBCONTROLCP_DLL_EXPORTS // defined if we are building the libcontrolcp DLL (instead of using it)
|
||||
#define LIBCONTROLCP_API LIBCONTROLCP_DLL_EXPORT
|
||||
#else
|
||||
#define LIBCONTROLCP_API LIBCONTROLCP_DLL_IMPORT
|
||||
#endif
|
||||
#define LIBCONTROLCP_LOCAL LIBCONTROLCP_DLL_LOCAL
|
||||
#endif
|
||||
|
||||
#endif /* __libcontrolcp_visibility_h__ */
|
||||
Loading…
Add table
Add a link
Reference in a new issue