ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Namespace FP8, FP16 to avoid symbol conflicts

This commit is contained in:
Robin Gareus 2017-12-12 14:09:40 +01:00
parent e3340cdf01
commit 7671a0f675
13 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/surfaces/faderport8/actions.cc
View File

@ -31,10 +31,10 @@
#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace ArdourSurface;
using namespace std;
using namespace ArdourSurface::FP8Types;
using namespace ARDOUR;
using namespace ArdourSurface::FP_NAMESPACE;
using namespace ArdourSurface::FP_NAMESPACE::FP8Types;
#define BindMethod(ID, CB) \
_ctrls.button (FP8Controls::ID).released.connect_same_thread (button_connections, boost::bind (&FaderPort8:: CB, this));

4
libs/surfaces/faderport8/callbacks.cc
View File

@ -30,8 +30,8 @@
#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace ArdourSurface;
using namespace ArdourSurface::FP8Types;
using namespace ArdourSurface::FP_NAMESPACE;
using namespace ArdourSurface::FP_NAMESPACE::FP8Types;
void
FaderPort8::connect_session_signals ()

4
libs/surfaces/faderport8/faderport8.cc
View File

@ -50,11 +50,11 @@
#include "faderport8.h"
using namespace ARDOUR;
using namespace ArdourSurface;
using namespace PBD;
using namespace Glib;
using namespace std;
using namespace ArdourSurface::FP8Types;
using namespace ArdourSurface::FP_NAMESPACE;
using namespace ArdourSurface::FP_NAMESPACE::FP8Types;
#include "pbd/i18n.h"

4
libs/surfaces/faderport8/faderport8.h
View File

@ -53,7 +53,7 @@ namespace ARDOUR {
class PluginInsert;
}
namespace ArdourSurface {
namespace ArdourSurface { namespace FP_NAMESPACE {
struct FaderPort8Request : public BaseUI::BaseRequestObject
{
@ -401,6 +401,6 @@ private:
UserActionMap _user_action_map;
};
} /* namespace */
} } /* namespace */
#endif /* ardour_surface_faderport8_h */

2
libs/surfaces/faderport8/faderport8_interface.cc
View File

@ -23,7 +23,7 @@
#include "faderport8.h"
using namespace ARDOUR;
using namespace ArdourSurface;
using namespace ArdourSurface::FP_NAMESPACE;
static ControlProtocol*
new_faderport8_midi_protocol (ControlProtocolDescriptor* /*descriptor*/, Session* s)

10
libs/surfaces/faderport8/fp8_base.h
View File

@ -24,7 +24,13 @@
#include "pbd/signals.h"
namespace ArdourSurface {
#ifdef FADERPORT16
#define FP_NAMESPACE FP16
#else
#define FP_NAMESPACE FP8
#endif
namespace ArdourSurface { namespace FP_NAMESPACE {
/* conveniece wrappers depending on "FP8Base& _base" */
#define fp8_loop dynamic_cast<BaseUI*>(&_base)->main_loop
@ -170,5 +176,5 @@ namespace FP8Types {
};
} /* namespace */
} } /* namespace */
#endif /* _ardour_surfaces_fp8base_h_ */

4
libs/surfaces/faderport8/fp8_button.h
View File

@ -27,7 +27,7 @@
#include "fp8_base.h"
namespace ArdourSurface {
namespace ArdourSurface { namespace FP_NAMESPACE {
/* virtual base-class and interface */
class FP8ButtonInterface
@ -505,5 +505,5 @@ private:
sigc::connection _press_timeout_connection;
};
} /* namespace */
} } /* namespace */
#endif /* _ardour_surfaces_fp8button_h_ */

4
libs/surfaces/faderport8/fp8_controls.cc
View File

@ -20,8 +20,8 @@
#include "fp8_controls.h"
using namespace ArdourSurface;
using namespace ArdourSurface::FP8Types;
using namespace ArdourSurface::FP_NAMESPACE;
using namespace ArdourSurface::FP_NAMESPACE::FP8Types;
bool FP8ButtonInterface::force_change = false;

4
libs/surfaces/faderport8/fp8_controls.h
View File

@ -25,7 +25,7 @@
#include "fp8_button.h"
#include "fp8_strip.h"
namespace ArdourSurface {
namespace ArdourSurface { namespace FP_NAMESPACE {
class FP8Controls
{
@ -170,5 +170,5 @@ protected:
PBD::ScopedConnectionList button_connections;
};
} /* namespace */
} } /* namespace */
#endif /* _ardour_surfaces_fp8controls_h_ */

4
libs/surfaces/faderport8/fp8_strip.cc
View File

@ -30,8 +30,8 @@
#include "fp8_strip.h"
using namespace ARDOUR;
using namespace ArdourSurface;
using namespace ArdourSurface::FP8Types;
using namespace ArdourSurface::FP_NAMESPACE;
using namespace ArdourSurface::FP_NAMESPACE::FP8Types;
uint8_t /* static */
FP8Strip::midi_ctrl_id (CtrlElement type, uint8_t id)

4
libs/surfaces/faderport8/fp8_strip.h
View File

@ -41,7 +41,7 @@ namespace ARDOUR {
class ReadOnlyControl;
}
namespace ArdourSurface {
namespace ArdourSurface { namespace FP_NAMESPACE {
class FP8Strip
{
@ -189,5 +189,5 @@ private:
std::string _last_line[4];
};
} /* namespace */
} } /* namespace */
#endif /* _ardour_surfaces_fp8strip_h_ */

2
libs/surfaces/faderport8/gui.cc
View File

@ -41,10 +41,10 @@
using namespace PBD;
using namespace ARDOUR;
using namespace ArdourSurface;
using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace ArdourSurface::FP_NAMESPACE;
void*
FaderPort8::get_gui () const

4
libs/surfaces/faderport8/gui.h
View File

@ -37,7 +37,7 @@ namespace Gtk {
#include "faderport8.h"
namespace ArdourSurface {
namespace ArdourSurface { namespace FP_NAMESPACE {
class FP8GUI : public Gtk::VBox
{
@ -108,6 +108,6 @@ private:
bool find_action_in_model (const Gtk::TreeModel::iterator& iter, std::string const & action_path, Gtk::TreeModel::iterator* found);
};
}
} }
#endif /* __ardour_faderport8_gui_h__ */