using namespace PBD;
using std::string;
+using std::list;
ExportFormatSpecification::Time &
ExportFormatSpecification::Time::operator= (AnyTime const & other)
{
- type = other.type;
- timecode = other.timecode;
- bbt = other.bbt;
-
- if (type == Frames) {
- frames = other.frames;
- } else {
- seconds = other.seconds;
- }
-
+ static_cast<AnyTime &>(*this) = other;
return *this;
}
-nframes_t
-ExportFormatSpecification::Time::get_frames (nframes_t target_rate) const
+framecnt_t
+ExportFormatSpecification::Time::get_frames_at (framepos_t position, framecnt_t target_rate) const
{
- //TODO position
- nframes_t duration = session.convert_to_frames_at (0, *this);
-
+ framecnt_t duration = session.any_duration_to_frames (position, *this);
return ((double) target_rate / session.frame_rate()) * duration + 0.5;
}
, _normalize (false)
, _normalize_target (1.0)
+ , _with_toc (false)
+ , _with_cue (false)
{
format_ids.insert (F_None);
endiannesses.insert (E_FileDefault);
set_state (state);
}
-ExportFormatSpecification::ExportFormatSpecification (ExportFormatSpecification const & other)
+ExportFormatSpecification::ExportFormatSpecification (ExportFormatSpecification const & other, bool modify_name)
: ExportFormatBase(other)
, session (other.session)
, _silence_beginning (other.session)
, _silence_end (other.session)
{
- set_name (other.name() + " (copy)");
+ if (modify_name) {
+ set_name (other.name() + " (copy)");
+ } else {
+ set_name (other.name());
+ }
_format_name = other._format_name;
has_sample_format = other.has_sample_format;
set_silence_beginning (other.silence_beginning_time());
set_silence_end (other.silence_end_time());
+
+ set_extension(other.extension());
}
ExportFormatSpecification::~ExportFormatSpecification ()
root->add_property ("name", _name);
root->add_property ("id", _id.to_s());
+ root->add_property ("with-cue", _with_cue ? "true" : "false");
+ root->add_property ("with-toc", _with_toc ? "true" : "false");
node = root->add_child ("Encoding");
node->add_property ("id", enum_2_string (format_id()));
node->add_property ("enabled", trim_beginning() ? "true" : "false");
node = start->add_child ("Add");
- node->add_property ("enabled", silence_beginning() > 0 ? "true" : "false");
+ node->add_property ("enabled", _silence_beginning.not_zero() ? "true" : "false");
node->add_child_nocopy (_silence_beginning.get_state());
node = end->add_child ("Trim");
node->add_property ("enabled", trim_end() ? "true" : "false");
node = end->add_child ("Add");
- node->add_property ("enabled", silence_end() > 0 ? "true" : "false");
+ node->add_property ("enabled", _silence_end.not_zero() ? "true" : "false");
node->add_child_nocopy (_silence_end.get_state());
return *root;
_id = prop->value();
}
+ if ((prop = root.property ("with-cue"))) {
+ _with_cue = string_is_affirmative (prop->value());
+ } else {
+ _with_cue = false;
+ }
+
+ if ((prop = root.property ("with-toc"))) {
+ _with_toc = string_is_affirmative (prop->value());
+ } else {
+ _with_toc = false;
+ }
+
/* Encoding and SRC */
if ((child = root.child ("Encoding"))) {
}
if ((prop = child->property ("has-sample-format"))) {
- has_sample_format = !prop->value().compare ("true");
+ has_sample_format = string_is_affirmative (prop->value());
+ }
+
+ if ((prop = child->property ("has-sample-format"))) {
+ has_sample_format = string_is_affirmative (prop->value());
}
if ((prop = child->property ("channel-limit"))) {
}
}
-Glib::ustring
-ExportFormatSpecification::description ()
+string
+ExportFormatSpecification::description (bool include_name)
{
- Glib::ustring desc;
-
- desc = _name + ": ";
+ list<string> components;
if (_normalize) {
- desc += _("normalize, ");
+ components.push_back (_("normalize"));
}
if (_trim_beginning && _trim_end) {
- desc += _("trim, ");
+ components.push_back ( _("trim"));
} else if (_trim_beginning) {
- desc += _("trim start, ");
+ components.push_back (_("trim start"));
} else if (_trim_end) {
- desc += "trim end, ";
+ components.push_back (_("trim end"));
}
- desc += _format_name + ", ";
+ if (_format_name != "") {
+ components.push_back (_format_name);
+ }
if (has_sample_format) {
- desc += HasSampleFormat::get_sample_format_name (sample_format()) + ", ";
+ components.push_back (HasSampleFormat::get_sample_format_name (sample_format()));
}
switch (sample_rate()) {
- case SR_22_05:
- desc += "22,5 kHz";
+ case SR_8:
+ components.push_back ("8 kHz");
break;
- case SR_44_1:
- desc += "44,1 kHz";
+ case SR_22_05:
+ components.push_back ("22,5 kHz");
break;
- case SR_48:
- desc += "48 kHz";
+ case SR_44_1:
+ components.push_back ("44,1 kHz");
break;
- case SR_88_2:
- desc += "88,2 kHz";
+ case SR_48:
+ components.push_back ("48 kHz");
break;
- case SR_96:
- desc += "96 kHz";
+ case SR_88_2:
+ components.push_back ("88,2 kHz");
break;
- case SR_192:
- desc += "192 kHz";
+ case SR_96:
+ components.push_back ("96 kHz");
break;
- case SR_None:
+ case SR_192:
+ components.push_back ("192 kHz");
+ break;
+ case SR_Session:
+ components.push_back (_("Session rate"));
+ break;
+ case SR_None:
break;
}
+ if (_with_toc) {
+ components.push_back ("TOC");
+ }
+
+ if (_with_cue) {
+ components.push_back ("CUE");
+ }
+
+ string desc;
+ if (include_name) {
+ desc = _name + ": ";
+ }
+
+ for (list<string>::const_iterator it = components.begin(); it != components.end(); ++it) {
+ if (it != components.begin()) { desc += ", "; }
+ desc += *it;
+ }
return desc;
}
projects / ardour.git / blobdiff