mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-13 10:06:33 +01:00
* Added PBD::UUID
* uuid headers are needed for building! * Export presets and format profiles use UUID * Moved ExportPreset class away from ExportProfileManager * Workaround for Gtk::NoteBook bug in ExportMainDialog git-svn-id: svn://localhost/ardour2/branches/3.0@3762 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
fa4bca989b
commit
68f04adec1
14 changed files with 367 additions and 227 deletions
|
|
@ -39,11 +39,6 @@ namespace ARDOUR
|
|||
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)
|
||||
{
|
||||
|
|
@ -189,8 +184,6 @@ ExportFormatSpecification::ExportFormatSpecification (Session & s) :
|
|||
sample_formats.insert (SF_None);
|
||||
sample_rates.insert (SR_None);
|
||||
qualities.insert (Q_None);
|
||||
|
||||
_id = ++_counter;
|
||||
}
|
||||
|
||||
ExportFormatSpecification::ExportFormatSpecification (Session & s, XMLNode const & state) :
|
||||
|
|
@ -210,7 +203,6 @@ ExportFormatSpecification::ExportFormatSpecification (ExportFormatSpecification
|
|||
_silence_end (other.session)
|
||||
{
|
||||
set_name (other.name() + " (copy)");
|
||||
_id = ++_counter;
|
||||
|
||||
_format_name = other._format_name;
|
||||
has_sample_format = other.has_sample_format;
|
||||
|
|
@ -250,7 +242,7 @@ ExportFormatSpecification::get_state ()
|
|||
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()));
|
||||
|
|
@ -313,8 +305,7 @@ ExportFormatSpecification::set_state (const XMLNode & root)
|
|||
}
|
||||
|
||||
if ((prop = root.property ("id"))) {
|
||||
std::istringstream iss (prop->value());
|
||||
iss >> _id;
|
||||
_id = prop->value();
|
||||
}
|
||||
|
||||
/* Encoding and SRC */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue