ardour/livetrax
13
0
Fork 0
Code

move ARDOUR::Configuration and ARDOUR::ConfigVariable into libpbd

Browse Source
This commit is contained in:
Paul Davis 2014-12-22 18:53:19 -05:00
parent 1f0fbea628
commit d854c5d93c
15 changed files with 46 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/option_editor.cc
View File

@ -22,7 +22,8 @@
#include <gtkmm/alignment.h>
#include "gtkmm2ext/utils.h"
#include "ardour/configuration.h"
#include "pbd/configuration.h"
#include "ardour/rc_configuration.h"
#include "ardour/utils.h"
#include "ardour/dB.h"
@ -377,7 +378,7 @@ OptionEditorPage::OptionEditorPage (Gtk::Notebook& n, std::string const & t)
* @param o Configuration to edit.
* @param t Title for the dialog.
*/
OptionEditor::OptionEditor (Configuration* c, std::string const & t)
OptionEditor::OptionEditor (PBD::Configuration* c, std::string const & t)
: ArdourWindow (t), _config (c)
{
using namespace Notebook_Helpers;

8
gtk2_ardour/option_editor.h
View File

@ -46,7 +46,7 @@
* options dialog.
*/
namespace ARDOUR {
namespace PBD {
class Configuration;
}
@ -647,7 +647,7 @@ public:
class OptionEditor : public ArdourWindow
{
public:
OptionEditor (ARDOUR::Configuration *, std::string const &);
OptionEditor (PBD::Configuration *, std::string const &);
~OptionEditor ();
void add_option (std::string const &, OptionEditorComponent *);
@ -658,8 +658,8 @@ public:
protected:
virtual void parameter_changed (std::string const &);
ARDOUR::Configuration* _config;
PBD::Configuration* _config;
private:

6
gtk2_ardour/ui_config.h
View File

@ -29,7 +29,7 @@
#include "pbd/stateful.h"
#include "pbd/xml++.h"
#include "ardour/configuration_variable.h"
#include "pbd/configuration_variable.h"
#include "canvas/colors.h"
@ -96,11 +96,11 @@ class UIConfiguration : public PBD::Stateful
/* declare variables */
#undef UI_CONFIG_VARIABLE
#define UI_CONFIG_VARIABLE(Type,var,name,value) ARDOUR::ConfigVariable<Type> var;
#define UI_CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
#include "ui_config_vars.h"
#undef UI_CONFIG_VARIABLE
#define CANVAS_FONT_VARIABLE(var,name) ARDOUR::ConfigVariable<std::string> var;
#define CANVAS_FONT_VARIABLE(var,name) PBD::ConfigVariable<std::string> var;
#include "canvas_vars.h"
#undef CANVAS_FONT_VARIABLE

1
libs/ardour/ardour/debug.h
View File

@ -33,7 +33,6 @@ namespace PBD {
LIBARDOUR_API extern uint64_t MidiPlaylistIO;
LIBARDOUR_API extern uint64_t MidiDiskstreamIO;
LIBARDOUR_API extern uint64_t SnapBBT;
LIBARDOUR_API extern uint64_t Configuration;
LIBARDOUR_API extern uint64_t Latency;
LIBARDOUR_API extern uint64_t LatencyCompensation;
LIBARDOUR_API extern uint64_t Peaks;

9
libs/ardour/ardour/rc_configuration.h
View File

@ -23,16 +23,17 @@
#include <map>
#include <string>
#include "pbd/configuration.h"
#include "ardour/libardour_visibility.h"
#include "ardour/types.h"
#include "ardour/utils.h"
#include "ardour/configuration.h"
class XMLNode;
namespace ARDOUR {
class LIBARDOUR_API RCConfiguration : public Configuration
class LIBARDOUR_API RCConfiguration : public PBD::Configuration
{
public:
RCConfiguration();
@ -74,8 +75,8 @@ class LIBARDOUR_API RCConfiguration : public Configuration
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(Type,var,name,value) ConfigVariable<Type> var;
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) ConfigVariableWithMutation<Type> var;
#define CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) PBD::ConfigVariableWithMutation<Type> var;
#include "ardour/rc_configuration_vars.h"
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL

8
libs/ardour/ardour/session_configuration.h
View File

@ -20,11 +20,11 @@
#ifndef __ardour_session_configuration_h__
#define __ardour_session_configuration_h__
#include "ardour/configuration.h"
#include "pbd/configuration.h"
namespace ARDOUR {
class LIBARDOUR_API SessionConfiguration : public Configuration
class LIBARDOUR_API SessionConfiguration : public PBD::Configuration
{
public:
SessionConfiguration ();
@ -58,8 +58,8 @@ public:
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(Type,var,name,value) ConfigVariable<Type> var;
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) ConfigVariableWithMutation<Type> var;
#define CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) PBD::ConfigVariableWithMutation<Type> var;
#include "ardour/session_configuration_vars.h"
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL

119
libs/ardour/configuration.cc
View File

@ -1,119 +0,0 @@
/*
Copyright (C) 1999-2009 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.
*/
#include <iostream>
#include "pbd/compose.h"
#include "ardour/configuration.h"
#include "ardour/debug.h"
using namespace ARDOUR;
using namespace std;
using namespace PBD;
Configuration::Configuration ()
{
}
Configuration::~Configuration ()
{
}
void
ConfigVariableBase::add_to_node (XMLNode& node)
{
const std::string v = get_as_string ();
DEBUG_TRACE (DEBUG::Configuration, string_compose ("Config variable %1 stored as [%2]\n", _name, v));
XMLNode* child = new XMLNode ("Option");
child->add_property ("name", _name);
child->add_property ("value", v);
node.add_child_nocopy (*child);
}
bool
ConfigVariableBase::set_from_node (XMLNode const & node)
{
if (node.name() == "Config" || node.name() == "Canvas" || node.name() == "UI") {
/* ardour.rc */
const XMLProperty* prop;
XMLNodeList nlist;
XMLNodeConstIterator niter;
XMLNode* child;
nlist = node.children();
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
child = *niter;
if (child->name() == "Option") {
if ((prop = child->property ("name")) != 0) {
if (prop->value() == _name) {
if ((prop = child->property ("value")) != 0) {
set_from_string (prop->value());
return true;
}
}
}
}
}
} else if (node.name() == "Options") {
/* session file */
XMLNodeList olist;
XMLNodeConstIterator oiter;
XMLNode* option;
const XMLProperty* opt_prop;
olist = node.children();
for (oiter = olist.begin(); oiter != olist.end(); ++oiter) {
option = *oiter;
if (option->name() == _name) {
if ((opt_prop = option->property ("val")) != 0) {
set_from_string (opt_prop->value());
return true;
}
}
}
}
return false;
}
void
ConfigVariableBase::notify ()
{
// placeholder for any debugging desired when a config variable is modified
}
void
ConfigVariableBase::miss ()
{
// placeholder for any debugging desired when a config variable
// is set but to the same value as it already has
}

1
libs/ardour/debug.cc
View File

@ -29,7 +29,6 @@ uint64_t PBD::DEBUG::MidiSourceIO = PBD::new_debug_bit ("midisourceio");
uint64_t PBD::DEBUG::MidiPlaylistIO = PBD::new_debug_bit ("midiplaylistio");
uint64_t PBD::DEBUG::MidiDiskstreamIO = PBD::new_debug_bit ("mididiskstreamio");
uint64_t PBD::DEBUG::SnapBBT = PBD::new_debug_bit ("snapbbt");
uint64_t PBD::DEBUG::Configuration = PBD::new_debug_bit ("configuration");
uint64_t PBD::DEBUG::Latency = PBD::new_debug_bit ("latency");
uint64_t PBD::DEBUG::LatencyCompensation = PBD::new_debug_bit ("latencycompensation");
uint64_t PBD::DEBUG::Peaks = PBD::new_debug_bit ("peaks");

3
libs/ardour/session_configuration.cc
View File

@ -21,12 +21,15 @@
#include <glib/gstdio.h> /* for g_stat() */
#include <glibmm/miscutils.h> /* for build_filename() */
#include "pbd/error.h"
#include "pbd/file_utils.h"
#include "pbd/locale_guard.h"
#include "pbd/pathexpand.h"
#include "ardour/types.h"
#include "ardour/filesystem_paths.h"
#include "ardour/session_configuration.h"
#include "ardour/utils.h"
#include "i18n.h"
using namespace ARDOUR;

1
libs/ardour/wscript
View File

@ -56,7 +56,6 @@ libardour_sources = [
'capturing_processor.cc',
'chan_count.cc',
'chan_mapping.cc',
'configuration.cc',
'config_text.cc',
'control_protocol_manager.cc',
'cycle_timer.cc',

1
libs/pbd/debug.cc
View File

@ -50,6 +50,7 @@ uint64_t PBD::DEBUG::Pool = PBD::new_debug_bit ("pool");
uint64_t PBD::DEBUG::EventLoop = PBD::new_debug_bit ("eventloop");
uint64_t PBD::DEBUG::AbstractUI = PBD::new_debug_bit ("abstractui");
uint64_t PBD::DEBUG::FileUtils = PBD::new_debug_bit ("fileutils");
uint64_t PBD::DEBUG::Configuration = PBD::new_debug_bit ("configuration");
uint64_t PBD::debug_bits = 0x0;

18
libs/ardour/ardour/configuration.h → libs/pbd/pbd/configuration.h
View File

@ -17,23 +17,23 @@
*/
#ifndef __ardour_configuration_h__
#define __ardour_configuration_h__
#ifndef __libpbd_configuration_h__
#define __libpbd_configuration_h__
#include <boost/function.hpp>
#include "pbd/signals.h"
#include "pbd/stateful.h"
#include "ardour/configuration_variable.h"
#include "pbd/configuration_variable.h"
class XMLNode;
namespace ARDOUR {
namespace PBD {
class LIBARDOUR_API Configuration : public PBD::Stateful
class LIBPBD_API Configuration : public PBD::Stateful
{
public:
Configuration();
virtual ~Configuration();
Configuration() {}
virtual ~Configuration() {}
virtual void map_parameters (boost::function<void (std::string)>&) = 0;
virtual int set_state (XMLNode const &, int) = 0;
@ -44,6 +44,6 @@ class LIBARDOUR_API Configuration : public PBD::Stateful
PBD::Signal1<void,std::string> ParameterChanged;
};
} // namespace ARDOUR
} // namespace PBD
#endif /* __ardour_configuration_h__ */
#endif /* __libpbd_configuration_h__ */

25
libs/ardour/ardour/configuration_variable.h → libs/pbd/pbd/configuration_variable.h
View File

@ -17,21 +17,20 @@
*/
#ifndef __ardour_configuration_variable_h__
#define __ardour_configuration_variable_h__
#ifndef __libpbd_configuration_variable_h__
#define __libpbd_configuration_variable_h__
#include <iostream>
#include <sstream>
#include <string>
#include "pbd/xml++.h"
#include "pbd/convert.h"
#include "ardour/libardour_visibility.h"
#include "ardour/types.h"
#include "ardour/utils.h"
#include "pbd/libpbd_visibility.h"
namespace ARDOUR {
namespace PBD {
class LIBARDOUR_API ConfigVariableBase {
class LIBPBD_API ConfigVariableBase {
public:
ConfigVariableBase (std::string str) : _name (str) {}
@ -52,7 +51,7 @@ class LIBARDOUR_API ConfigVariableBase {
};
template<class T>
class /*LIBARDOUR_API*/ ConfigVariable : public ConfigVariableBase
class /*LIBPBD_API*/ ConfigVariable : public ConfigVariableBase
{
public:
@ -92,7 +91,7 @@ class /*LIBARDOUR_API*/ ConfigVariable : public ConfigVariableBase
/** Specialisation of ConfigVariable for std::string to cope with whitespace properly */
template<>
class /*LIBARDOUR_API*/ ConfigVariable<std::string> : public ConfigVariableBase
class /*LIBPBD_API*/ ConfigVariable<std::string> : public ConfigVariableBase
{
public:
@ -127,7 +126,7 @@ class /*LIBARDOUR_API*/ ConfigVariable<std::string> : public ConfigVariableBase
};
template<>
class /*LIBARDOUR_API*/ ConfigVariable<bool> : public ConfigVariableBase
class /*LIBPBD_API*/ ConfigVariable<bool> : public ConfigVariableBase
{
public:
@ -164,7 +163,7 @@ class /*LIBARDOUR_API*/ ConfigVariable<bool> : public ConfigVariableBase
};
template<class T>
class /*LIBARDOUR_API*/ ConfigVariableWithMutation : public ConfigVariable<T>
class /*LIBPBD_API*/ ConfigVariableWithMutation : public ConfigVariable<T>
{
public:
ConfigVariableWithMutation (std::string name, T val, T (*m)(T))
@ -193,7 +192,7 @@ class /*LIBARDOUR_API*/ ConfigVariableWithMutation : public ConfigVariable<T>
};
template<>
class /*LIBARDOUR_API*/ ConfigVariableWithMutation<std::string> : public ConfigVariable<std::string>
class /*LIBPBD_API*/ ConfigVariableWithMutation<std::string> : public ConfigVariable<std::string>
{
public:
ConfigVariableWithMutation (std::string name, std::string val, std::string (*m)(std::string))
@ -219,4 +218,4 @@ class /*LIBARDOUR_API*/ ConfigVariableWithMutation<std::string> : public ConfigV
}
#endif /* __ardour_configuration_variable_h__ */
#endif /* __libpbd_configuration_variable_h__ */

1
libs/pbd/pbd/debug.h
View File

@ -45,6 +45,7 @@ namespace PBD {
LIBPBD_API extern uint64_t Pool;
LIBPBD_API extern uint64_t EventLoop;
LIBPBD_API extern uint64_t AbstractUI;
LIBPBD_API extern uint64_t Configuration;
extern uint64_t FileUtils;
}
}

1
libs/pbd/wscript
View File

@ -34,6 +34,7 @@ libpbd_sources = [
'boost_debug.cc',
'cartesian.cc',
'command.cc',
'configuration_variable.cc',
'convert.cc',
'controllable.cc',
'controllable_descriptor.cc',