libraries['xslt'] = LibraryInfo()
libraries['xslt'].ParseConfig('pkg-config --cflags --libs libxslt')
+libraries['uuid'] = LibraryInfo()
+libraries['uuid'].ParseConfig('pkg-config --cflags --libs uuid')
+
libraries['glib2'] = LibraryInfo()
libraries['glib2'].ParseConfig ('pkg-config --cflags --libs glib-2.0')
libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0')
#include <ardour/export_filename.h>
#include <ardour/export_format_specification.h>
#include <ardour/export_channel_configuration.h>
+#include <ardour/export_preset.h>
#include "i18n.h"
file_notebook.set_tab_label_packing (new_file_dummy, true, true, Gtk::PACK_START);
new_file_hbox.show_all_children ();
- file_notebook.signal_switch_page().connect (sigc::mem_fun (*this, &ExportMainDialog::handle_page_change));
+ page_change_connection = file_notebook.signal_switch_page().connect (sigc::mem_fun (*this, &ExportMainDialog::handle_page_change));
new_file_button.signal_clicked().connect (sigc::mem_fun (*this, &ExportMainDialog::add_new_file_page));
/* Load states */
void
ExportMainDialog::sync_with_manager ()
{
- /* Clear */
+ /* Clear pages from notebook
+ The page switch handling has to be disabled during removing all pages due to a gtk bug
+ */
+ page_change_connection.block();
while (file_notebook.get_n_pages() > 1) {
file_notebook.remove_page (0);
}
+ page_change_connection.block(false);
page_counter = 1;
last_visible_page = 0;
void
ExportMainDialog::handle_page_change (GtkNotebookPage*, uint page)
{
- if (file_notebook.get_n_pages() == 2 && page == 0) { return; }
-
if (page + 1 == (uint32_t) file_notebook.get_n_pages()) {
file_notebook.set_current_page (last_visible_page);
} else {
void add_file_page (ARDOUR::ExportProfileManager::FormatStatePtr format_state, ARDOUR::ExportProfileManager::FilenameStatePtr filename_state);
void remove_file_page (FilePage * page);
void update_remove_file_page_sensitivity ();
+
+ sigc::connection page_change_connection;
void handle_page_change (GtkNotebookPage*, uint32_t page);
uint32_t last_visible_page;
export_formats.cc
export_format_specification.cc
export_handler.cc
+export_preset.cc
export_processor.cc
export_profile_manager.cc
export_status.cc
#include <glibmm/ustring.h>
+#include <pbd/uuid.h>
+
#include <ardour/types.h>
#include <ardour/export_format_base.h>
/* Accessing functions */
- uint32_t id () { return _id; }
+ PBD::UUID const & id () { return _id; }
Glib::ustring const & name () const { return _name; }
Glib::ustring description ();
/* The variables below have getters and setters */
Glib::ustring _name;
- uint32_t _id;
+ PBD::UUID _id;
Type _type;
DitherType _dither_type;
void add_option (XMLNode * node, std::string const & name, std::string const & value);
std::string get_option (XMLNode const * node, std::string const & name);
-
- /*** Static stuff for id management, ExportElementFactory will have access to these ***/
-
- static void init_counter (uint32_t val) { if (val > _counter) { _counter = val; } }
- static uint32_t counter () { return _counter; }
-
- static uint32_t _counter;
};
--- /dev/null
+/*
+ Copyright (C) 2008 Paul Davis
+ Author: Sakari Bergen
+
+ 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 __ardour_export_preset_h__
+#define __ardour_export_preset_h__
+
+#include <string>
+
+#include <pbd/uuid.h>
+#include <pbd/xml++.h>
+
+using std::string;
+
+namespace ARDOUR
+{
+
+class Session;
+
+class ExportPreset {
+ public:
+ ExportPreset (string filename, Session & s);
+ ~ExportPreset ();
+
+ PBD::UUID const & id () const { return _id; }
+ string name () const { return _name; }
+
+ void set_name (string const & name);
+
+ // Note: The set_..._state functions take ownership of the XMLNode
+ void set_global_state (XMLNode & state);
+ void set_local_state (XMLNode & state);
+
+ XMLNode const * get_global_state () const { return global.root(); }
+ XMLNode const * get_local_state () const { return local; }
+
+ void save () const;
+ void remove_local () const;
+
+ private:
+
+ void set_id (string const & id);
+
+ XMLNode * get_instant_xml () const;
+ void save_instant_xml () const;
+ void remove_instant_xml () const;
+
+ PBD::UUID _id;
+ string _name;
+
+ Session & session;
+ XMLTree global;
+ XMLNode * local;
+
+};
+
+} // namespace ARDOUR
+
+#endif // __ardour_export_preset_h__
#include <sigc++/signal.h>
#include <glibmm/ustring.h>
+#include <pbd/uuid.h>
#include <pbd/file_utils.h>
#include <pbd/xml++.h>
class ExportChannelConfiguration;
class ExportFormatSpecification;
class ExportFilename;
+class ExportPreset;
class Location;
class Session;
/// Manages (de)serialization of export profiles and related classes
class ExportProfileManager
{
- public:
- class Preset {
- public:
- Preset (string filename, Session & s);
- ~Preset ();
-
- uint32_t id () const { return _id; }
- string name () const { return _name; }
-
- void set_name (string name);
- void set_id (uint32_t id);
-
- // Note: The set_..._state functions take ownership of the XMLNode
- void set_global_state (XMLNode & state);
- void set_local_state (XMLNode & state);
-
- XMLNode const * get_global_state () const { return global.root(); }
- XMLNode const * get_local_state () const { return local; }
-
- void save () const;
- void remove_local () const;
-
- private:
-
- XMLNode * get_instant_xml () const;
- void save_instant_xml () const;
- void remove_instant_xml () const;
-
- uint32_t _id;
- string _name;
-
- Session & session;
- XMLTree global;
- XMLNode * local;
-
- };
-
- typedef boost::shared_ptr<Preset> PresetPtr;
- typedef std::list<PresetPtr> PresetList;
-
public:
ExportProfileManager (Session & s);
void load_profile ();
void prepare_for_export ();
+ typedef boost::shared_ptr<ExportPreset> PresetPtr;
+ typedef std::list<PresetPtr> PresetList;
+
PresetList const & get_presets () { return preset_list; }
void load_preset (PresetPtr preset);
PresetPtr save_preset (string const & name);
private:
typedef boost::shared_ptr<ExportHandler> HandlerPtr;
- typedef std::pair<uint32_t, PBD::sys::path> FilePair;
- typedef std::map<uint32_t, PBD::sys::path> FileMap;
+ typedef std::pair<PBD::UUID, PBD::sys::path> FilePair;
+ typedef std::map<PBD::UUID, PBD::sys::path> FileMap;
HandlerPtr handler;
Session & session;
void load_presets ();
- uint32_t load_preset_from_disk (PBD::sys::path const & path); // Returns preset id
+ void load_preset_from_disk (PBD::sys::path const & path);
void set_state (XMLNode const & root);
void set_global_state (XMLNode const & root);
PresetList preset_list;
PresetPtr current_preset;
- uint32_t preset_id_counter;
FileMap preset_file_map;
std::vector<PBD::sys::path> find_file (std::string const & pattern);
using namespace PBD;
using std::string;
-/* The id counter is initialized to 1000 so that user created profiles have a id > 1000
- * while ones shipped with ardour have one < 1000
- */
-uint32_t ExportFormatSpecification::_counter = 1000;
-
ExportFormatSpecification::Time &
ExportFormatSpecification::Time::operator= (AnyTime const & other)
{
sample_formats.insert (SF_None);
sample_rates.insert (SR_None);
qualities.insert (Q_None);
-
- _id = ++_counter;
}
ExportFormatSpecification::ExportFormatSpecification (Session & s, XMLNode const & state) :
_silence_end (other.session)
{
set_name (other.name() + " (copy)");
- _id = ++_counter;
_format_name = other._format_name;
has_sample_format = other.has_sample_format;
XMLNode * root = new XMLNode ("ExportFormatSpecification");
root->add_property ("name", _name);
- root->add_property ("id", to_string (_id, std::dec));
+ root->add_property ("id", _id.to_s());
node = root->add_child ("Encoding");
node->add_property ("id", enum_2_string (format_id()));
}
if ((prop = root.property ("id"))) {
- std::istringstream iss (prop->value());
- iss >> _id;
+ _id = prop->value();
}
/* Encoding and SRC */
ExportElementFactory::ExportElementFactory (Session & session) :
session (session)
{
- XMLProperty * prop;
- XMLNode * instant_node = ARDOUR::Config->instant_xml ("ExportFormatSpecification");
- if (instant_node && (prop = instant_node->property ("id-counter"))) {
- ExportFormatSpecification::init_counter (atoi (prop->value()));
- }
+
}
ExportElementFactory::~ExportElementFactory ()
{
- XMLNode * instant_node = new XMLNode ("ExportFormatSpecification");
- instant_node->add_property ("id-counter", to_string (ExportFormatSpecification::counter(), std::dec));
- ARDOUR::Config->add_instant_xml (*instant_node);
+
}
ExportElementFactory::TimespanPtr
--- /dev/null
+/*
+ Copyright (C) 2008 Paul Davis
+ Author: Sakari Bergen
+
+ 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 <ardour/export_preset.h>
+
+#include <ardour/session.h>
+
+using namespace ARDOUR;
+
+ExportPreset::ExportPreset (string filename, Session & s) :
+ session (s), global (filename), local (0)
+{
+ XMLNode * root;
+ if ((root = global.root())) {
+ XMLProperty * prop;
+ if ((prop = root->property ("id"))) {
+ set_id (prop->value());
+ }
+ if ((prop = root->property ("name"))) {
+ set_name (prop->value());
+ }
+
+ XMLNode * instant_xml = get_instant_xml ();
+ if (instant_xml) {
+ XMLNode * instant_copy = new XMLNode (*instant_xml);
+ set_local_state (*instant_copy);
+ }
+ }
+}
+
+ExportPreset::~ExportPreset ()
+{
+ if (local) {
+ delete local;
+ }
+}
+
+void
+ExportPreset::set_name (string const & name)
+{
+ _name = name;
+
+ XMLNode * node;
+ if ((node = global.root())) {
+ node->add_property ("name", name);
+ }
+ if (local) {
+ local->add_property ("name", name);
+ }
+}
+
+void
+ExportPreset::set_id (string const & id)
+{
+ _id = id;
+
+ XMLNode * node;
+ if ((node = global.root())) {
+ node->add_property ("id", id);
+ }
+ if (local) {
+ local->add_property ("id", id);
+ }
+}
+
+void
+ExportPreset::set_global_state (XMLNode & state)
+{
+ delete global.root ();
+ global.set_root (&state);
+
+ set_id (_id.to_s());
+ set_name (_name);
+}
+
+void
+ExportPreset::set_local_state (XMLNode & state)
+{
+ delete local;
+ local = &state;
+
+ set_id (_id.to_s());
+ set_name (_name);
+}
+
+void
+ExportPreset::save () const
+{
+ save_instant_xml ();
+ if (global.root()) {
+ global.write ();
+ }
+}
+
+void
+ExportPreset::remove_local () const
+{
+ remove_instant_xml ();
+}
+
+XMLNode *
+ExportPreset::get_instant_xml () const
+{
+ XMLNode * instant_xml;
+
+ if ((instant_xml = session.instant_xml ("ExportPresets"))) {
+ XMLNodeList children = instant_xml->children ("ExportPreset");
+ for (XMLNodeList::iterator it = children.begin(); it != children.end(); ++it) {
+ XMLProperty * prop;
+ if ((prop = (*it)->property ("id")) && _id == PBD::UUID(prop->value())) {
+ return *it;
+ }
+ }
+ }
+
+ return 0;
+}
+
+void
+ExportPreset::save_instant_xml () const
+{
+ if (!local) { return; }
+
+ /* First remove old, then add new */
+
+ remove_instant_xml ();
+
+ XMLNode * instant_xml;
+ if ((instant_xml = session.instant_xml ("ExportPresets"))) {
+ instant_xml->add_child_copy (*local);
+ } else {
+ instant_xml = new XMLNode ("ExportPresets");
+ instant_xml->add_child_copy (*local);
+ session.add_instant_xml (*instant_xml, false);
+ }
+}
+
+void
+ExportPreset::remove_instant_xml () const
+{
+ XMLNode * instant_xml;
+ if ((instant_xml = session.instant_xml ("ExportPresets"))) {
+ instant_xml->remove_nodes_and_delete ("id", _id.to_s());
+ }
+}
#include <ardour/export_timespan.h>
#include <ardour/export_channel_configuration.h>
#include <ardour/export_filename.h>
+#include <ardour/export_preset.h>
#include <ardour/export_handler.h>
#include <ardour/session.h>
namespace ARDOUR
{
-ExportProfileManager::Preset::Preset (string filename, Session & s) :
- _id (0), session (s), global (filename), local (0)
-{
- XMLNode * root;
- if ((root = global.root())) {
- XMLProperty * prop;
- if ((prop = root->property ("id"))) {
- set_id ((uint32_t) atoi (prop->value()));
- }
- if ((prop = root->property ("name"))) {
- set_name (prop->value());
- }
-
- XMLNode * instant_xml = get_instant_xml ();
- if (instant_xml) {
- XMLNode * instant_copy = new XMLNode (*instant_xml);
- set_local_state (*instant_copy);
- }
- }
-}
-
-ExportProfileManager::Preset::~Preset ()
-{
- if (local) {
- delete local;
- }
-}
-
-void
-ExportProfileManager::Preset::set_name (string name)
-{
- _name = name;
-
- XMLNode * node;
- if ((node = global.root())) {
- node->add_property ("name", name);
- }
- if (local) {
- local->add_property ("name", name);
- }
-}
-
-void
-ExportProfileManager::Preset::set_id (uint32_t id)
-{
- _id = id;
-
- XMLNode * node;
- if ((node = global.root())) {
- node->add_property ("id", id);
- }
- if (local) {
- local->add_property ("id", id);
- }
-}
-
-void
-ExportProfileManager::Preset::set_global_state (XMLNode & state)
-{
- delete global.root ();
- global.set_root (&state);
-
- set_id (_id);
- set_name (_name);
-}
-
-void
-ExportProfileManager::Preset::set_local_state (XMLNode & state)
-{
- delete local;
- local = &state;
-
- set_id (_id);
- set_name (_name);
-}
-
-void
-ExportProfileManager::Preset::save () const
-{
- save_instant_xml ();
- if (global.root()) {
- global.write ();
- }
-}
-
-void
-ExportProfileManager::Preset::remove_local () const
-{
- remove_instant_xml ();
-}
-
-XMLNode *
-ExportProfileManager::Preset::get_instant_xml () const
-{
- XMLNode * instant_xml;
-
- if ((instant_xml = session.instant_xml ("ExportPresets"))) {
- XMLNodeList children = instant_xml->children ("ExportPreset");
- for (XMLNodeList::iterator it = children.begin(); it != children.end(); ++it) {
- XMLProperty * prop;
- if ((prop = (*it)->property ("id")) && _id == (uint32_t) atoi (prop->value())) {
- return *it;
- }
- }
- }
-
- return 0;
-}
-
-void
-ExportProfileManager::Preset::save_instant_xml () const
-{
- if (!local) { return; }
-
- /* First remove old, then add new */
-
- remove_instant_xml ();
-
- XMLNode * instant_xml;
- if ((instant_xml = session.instant_xml ("ExportPresets"))) {
- instant_xml->add_child_copy (*local);
- } else {
- instant_xml = new XMLNode ("ExportPresets");
- instant_xml->add_child_copy (*local);
- session.add_instant_xml (*instant_xml, false);
- }
-}
-
-void
-ExportProfileManager::Preset::remove_instant_xml () const
-{
- XMLNode * instant_xml;
- if ((instant_xml = session.instant_xml ("ExportPresets"))) {
- instant_xml->remove_nodes_and_delete ("id", to_string (_id, std::dec));
- }
-}
-
ExportProfileManager::ExportProfileManager (Session & s) :
handler (s.get_export_handler()),
session (s),
void
ExportProfileManager::load_presets ()
{
- preset_id_counter = 0;
-
vector<sys::path> found = find_file ("*.preset");
for (vector<sys::path>::iterator it = found.begin(); it != found.end(); ++it) {
- preset_id_counter = std::max (preset_id_counter, load_preset_from_disk (*it));
+ load_preset_from_disk (*it);
}
}
ExportProfileManager::save_preset (string const & name)
{
if (!current_preset) {
- ++preset_id_counter;
- string filename = export_config_dir.to_string() + "/" + to_string (preset_id_counter, std::dec) + ".preset";
- current_preset.reset (new Preset (filename, session));
+ string filename = export_config_dir.to_string() + "/" + name + ".preset";
+ current_preset.reset (new ExportPreset (filename, session));
preset_list.push_back (current_preset);
- current_preset->set_id (preset_id_counter);
}
XMLNode * global_preset = new XMLNode ("ExportPreset");
current_preset.reset();
}
-uint32_t
+void
ExportProfileManager::load_preset_from_disk (PBD::sys::path const & path)
{
- PresetPtr preset (new Preset (path.to_string(), session));
+ PresetPtr preset (new ExportPreset (path.to_string(), session));
preset_list.push_back (preset);
/* Handle id to filename mapping */
FilePair pair (preset->id(), path);
preset_file_map.insert (pair);
-
- return preset->id();
}
void
ExportProfileManager::deserialize_format (XMLNode & root)
{
XMLProperty * prop;
- uint32_t id = 0;
+ UUID id;
if ((prop = root.property ("id"))) {
- id = atoi (prop->value());
+ id = prop->value();
}
for (FormatList::iterator it = format_list->begin(); it != format_list->end(); ++it) {
{
XMLNode * root = new XMLNode ("ExportFormat");
- string id = state->format ? to_string (state->format->id(), std::dec) : "0";
+ string id = state->format ? state->format->id().to_s() : "";
root->add_property ("id", id);
return *root;
textreceiver.cc
transmitter.cc
undo.cc
+uuid.cc
version.cc
whitespace.cc
xml++.cc
pbd.Merge ([ libraries['sigc2'],
libraries['xml'],
+ libraries['uuid'],
libraries['glibmm2'],
libraries['glib2'] ])
--- /dev/null
+/*
+ Copyright (C) 2008 Paul Davis
+ Author: Sakari Bergen
+
+ 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 __pbd_uuid_h__
+#define __pbd_uuid_h__
+
+#include <string>
+#include <uuid/uuid.h>
+
+namespace PBD {
+
+class UUID {
+
+ public:
+ UUID () { uuid_generate (id); }
+ UUID (UUID const & other) { uuid_copy (id, other.id); }
+ UUID (std::string const & str) { uuid_parse (str.c_str(), id); }
+
+ UUID& operator= (std::string const & str);
+ std::string to_s () const;
+
+ bool operator== (UUID const & other) const { return !uuid_compare (id, other.id); }
+ bool operator!= (UUID const & other) const { return uuid_compare (id, other.id); }
+ bool operator< (UUID const & other) const { return uuid_compare (id, other.id) < 0; }
+
+ operator bool() const { return !uuid_is_null (id); }
+
+ private:
+ uuid_t id;
+
+};
+
+} // namespace PBD
+
+#endif // __pbd_uuid_h__
--- /dev/null
+/*
+ Copyright (C) 2008 Paul Davis
+ Author: Sakari Bergen
+
+ 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 <pbd/uuid.h>
+
+using namespace PBD;
+
+UUID&
+UUID::operator= (std::string const & str)
+{
+ uuid_parse (str.c_str(), id);
+ return *this;
+}
+
+std::string
+UUID::to_s () const
+{
+ char buf[37];
+ uuid_unparse (id, buf);
+ return std::string (buf);
+}
projects / ardour.git / commitdiff