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

Fix compilation with older Glib.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11378 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard
2012-01-28 18:19:19 +00:00
parent db384a6f14
commit 6f23443c26
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,6 +156,7 @@ class LV2Plugin : public ARDOUR::Plugin
static uint32_t _midi_event_type;
static uint32_t _state_path_type;
const std::string plugin_dir () const;
const std::string scratch_dir () const;
const std::string file_dir () const;
const std::string state_dir (unsigned num) const;

24
libs/ardour/lv2_plugin.cc
View File

@@ -460,29 +460,32 @@ LV2Plugin::c_ui_type ()
return (void*)_impl->ui_type;
}
/** Directory for all plugin state. */
const std::string
LV2Plugin::plugin_dir() const
{
return Glib::build_filename(_session.plugins_dir(), _insert_id.to_s());
}
/** Directory for files created by the plugin (except during save). */
const std::string
LV2Plugin::scratch_dir() const
{
return Glib::build_filename(
_session.plugins_dir(), _insert_id.to_s(), "scratch");
return Glib::build_filename(plugin_dir(), "scratch");
}
/** Directory for snapshots of files in the scratch directory. */
const std::string
LV2Plugin::file_dir() const
{
return Glib::build_filename(
_session.plugins_dir(), _insert_id.to_s(), "files");
return Glib::build_filename(plugin_dir(), "files");
}
/** Directory to save state snapshot version @c num into. */
const std::string
LV2Plugin::state_dir(unsigned num) const
{
return Glib::build_filename(_session.plugins_dir(),
_insert_id.to_s(),
string_compose("state%1", num));
return Glib::build_filename(plugin_dir(), string_compose("state%1", num));
}
/** Implementation of state:makePath for files created at instantiation time.
@@ -780,10 +783,9 @@ LV2Plugin::set_state(const XMLNode& node, int version)
prop->value()) << endmsg;
}
std::string state_file = Glib::build_filename(_session.plugins_dir(),
_insert_id.to_s(),
prop->value(),
"state.ttl");
std::string state_file = Glib::build_filename(
plugin_dir(),
Glib::build_filename(prop->value(), "state.ttl"));
cout << "Loading LV2 state from " << state_file << endl;
LilvState* state = lilv_state_new_from_file(