X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fexport_format_specification.h;h=7afb0bc73492f4f37fd48d19026abf6c4df7bd1d;hb=da9b82732eed632d8b940818382f7eb369100964;hp=3b9382237c08f8beadb903be77255b89ff1277b4;hpb=dde0848a984e06cbc1d4117d9cffa75c191f3b39;p=ardour.git

diff --git a/libs/ardour/ardour/export_format_specification.h b/libs/ardour/ardour/export_format_specification.h
index 3b9382237c..7afb0bc734 100644
--- a/libs/ardour/ardour/export_format_specification.h
+++ b/libs/ardour/ardour/export_format_specification.h
@@ -21,7 +21,7 @@
 #ifndef __ardour_export_format_specification_h__
 #define __ardour_export_format_specification_h__
 
-#include <glibmm/ustring.h>
+#include <string>
 
 #include "pbd/uuid.h"
 
@@ -47,7 +47,7 @@ class ExportFormatSpecification : public ExportFormatBase {
 		Time (Session & session) : AnyTime (), session (session) {}
 		Time & operator= (AnyTime const & other);
 
-		nframes_t get_frames (nframes_t target_rate) const;
+		framecnt_t get_frames_at (framepos_t position, framecnt_t target_rate) const;
 
 		/* Serialization */
 
@@ -76,7 +76,7 @@ class ExportFormatSpecification : public ExportFormatBase {
 
 	void set_format (boost::shared_ptr<ExportFormat> format);
 
-	void set_name (Glib::ustring const & name) { _name = name; }
+	void set_name (std::string const & name) { _name = name; }
 
 	void set_type (Type type) { _type = type; }
 	void set_format_id (FormatId value) { format_ids.clear(); format_ids.insert (value); }
@@ -100,12 +100,12 @@ class ExportFormatSpecification : public ExportFormatBase {
 	/* Accessing functions */
 
 	PBD::UUID const & id () { return _id; }
-	Glib::ustring const & name () const { return _name; }
-	Glib::ustring description ();
+	std::string const & name () const { return _name; }
+	std::string description ();
 
 	bool has_broadcast_info () const { return _has_broadcast_info; }
 	uint32_t channel_limit () const { return _channel_limit; }
-	Glib::ustring format_name () const { return _format_name; }
+	std::string format_name () const { return _format_name; }
 
 	Type type () const { return _type; }
 	FormatId format_id () const { return *format_ids.begin(); }
@@ -123,11 +123,10 @@ class ExportFormatSpecification : public ExportFormatBase {
 
 	bool tag () const { return _tag && supports_tagging; }
 
-	nframes_t silence_beginning () const { return _silence_beginning.get_frames (sample_rate()); }
-	nframes_t silence_end () const { return _silence_end.get_frames (sample_rate()); }
-
-	nframes_t silence_beginning (nframes_t samplerate) const { return _silence_beginning.get_frames (samplerate); }
-	nframes_t silence_end (nframes_t samplerate) const { return _silence_end.get_frames (samplerate); }
+	framecnt_t silence_beginning_at (framepos_t position, framecnt_t samplerate) const
+		{ return _silence_beginning.get_frames_at (position, samplerate); }
+	framecnt_t silence_end_at (framepos_t position, framecnt_t samplerate) const
+		{ return _silence_end.get_frames_at (position, samplerate); }
 
 	AnyTime silence_beginning_time () const { return _silence_beginning; }
 	AnyTime silence_end_time () const { return _silence_end; }
@@ -144,7 +143,7 @@ class ExportFormatSpecification : public ExportFormatBase {
 
 	/* The variables below do not have setters (usually set via set_format) */
 
-	Glib::ustring  _format_name;
+	std::string  _format_name;
 	bool            has_sample_format;
 	bool            supports_tagging;
 	bool           _has_broadcast_info;
@@ -152,7 +151,7 @@ class ExportFormatSpecification : public ExportFormatBase {
 
 	/* The variables below have getters and setters */
 
-	Glib::ustring   _name;
+	std::string   _name;
 	PBD::UUID       _id;
 
 	Type            _type;