summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/audio_unit.h4
-rw-r--r--libs/ardour/ardour/audiofilesource.h48
-rw-r--r--libs/ardour/ardour/audiosource.h20
-rw-r--r--libs/ardour/ardour/configuration_vars.h2
-rw-r--r--libs/ardour/ardour/plugin.h4
-rw-r--r--libs/ardour/ardour/session.h6
-rw-r--r--libs/ardour/ardour/sndfilesource.h6
-rw-r--r--libs/ardour/ardour/utils.h10
8 files changed, 50 insertions, 50 deletions
diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h
index cc1604f725..8d608fd074 100644
--- a/libs/ardour/ardour/audio_unit.h
+++ b/libs/ardour/ardour/audio_unit.h
@@ -225,7 +225,7 @@ class AUPluginInfo : public PluginInfo {
AUPluginCachedInfo cache;
static PluginInfoList discover ();
- static void get_names (CAComponentDescription&, std::string& name, Glib::ustring& maker);
+ static void get_names (CAComponentDescription&, std::string& name, std::string& maker);
static std::string stringify_descriptor (const CAComponentDescription&);
static int load_cached_info ();
@@ -238,7 +238,7 @@ class AUPluginInfo : public PluginInfo {
static void discover_fx (PluginInfoList&);
static void discover_generators (PluginInfoList&);
static void discover_by_description (PluginInfoList&, CAComponentDescription&);
- static Glib::ustring au_cache_path ();
+ static std::string au_cache_path ();
typedef std::map<std::string,AUPluginCachedInfo> CachedInfoMap;
static CachedInfoMap cached_info;
diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index b91ce79079..6231c8f8b3 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -56,19 +56,19 @@ class AudioFileSource : public AudioSource {
virtual ~AudioFileSource ();
- int set_name (Glib::ustring newname, bool destructive);
+ int set_name (std::string newname, bool destructive);
- Glib::ustring path() const { return _path; }
- Glib::ustring peak_path (Glib::ustring audio_path);
- Glib::ustring find_broken_peakfile (Glib::ustring missing_peak_path, Glib::ustring audio_path);
+ std::string path() const { return _path; }
+ std::string peak_path (std::string audio_path);
+ std::string find_broken_peakfile (std::string missing_peak_path, std::string audio_path);
uint16_t channel() const { return _channel; }
- static void set_peak_dir (Glib::ustring dir) { peak_dir = dir; }
+ static void set_peak_dir (std::string dir) { peak_dir = dir; }
- static bool get_soundfile_info (Glib::ustring path, SoundFileInfo& _info, std::string& error);
+ static bool get_soundfile_info (std::string path, SoundFileInfo& _info, std::string& error);
- static bool safe_file_extension (Glib::ustring path);
+ static bool safe_file_extension (std::string path);
void set_allow_remove_if_empty (bool yn);
void mark_for_remove();
@@ -86,19 +86,19 @@ class AudioFileSource : public AudioSource {
virtual int update_header (nframes_t when, struct tm&, time_t) = 0;
virtual int flush_header () = 0;
- int move_to_trash (const Glib::ustring& trash_dir_name);
+ int move_to_trash (const std::string& trash_dir_name);
- static bool is_empty (Session&, Glib::ustring path);
+ static bool is_empty (Session&, std::string path);
void mark_streaming_write_completed ();
- void mark_take (Glib::ustring);
- Glib::ustring take_id() const { return _take_id; }
+ void mark_take (std::string);
+ std::string take_id() const { return _take_id; }
bool is_embedded() const { return _is_embedded; }
static void set_bwf_serial_number (int);
- static void set_search_path (Glib::ustring string);
+ static void set_search_path (std::string string);
static void set_header_position_offset (nframes_t offset );
int setup_peakfile ();
@@ -127,38 +127,38 @@ class AudioFileSource : public AudioSource {
virtual void set_timeline_position (int64_t pos);
- static bool find (Glib::ustring path, bool must_exist, bool embedded, bool& is_new, uint16_t& chan,
- Glib::ustring& found_path, std::string& found_name);
+ static bool find (std::string path, bool must_exist, bool embedded, bool& is_new, uint16_t& chan,
+ std::string& found_path, std::string& found_name);
protected:
/* constructor to be called for existing external-to-session files */
- AudioFileSource (Session&, Glib::ustring path, Flag flags);
+ AudioFileSource (Session&, std::string path, Flag flags);
/* constructor to be called for new in-session files */
- AudioFileSource (Session&, Glib::ustring path, Flag flags,
+ AudioFileSource (Session&, std::string path, Flag flags,
SampleFormat samp_format, HeaderFormat hdr_format);
/* constructor to be called for existing in-session files */
AudioFileSource (Session&, const XMLNode&, bool must_exit = true);
- int init (Glib::ustring idstr, bool must_exist);
+ int init (std::string idstr, bool must_exist);
- Glib::ustring _path;
+ std::string _path;
Flag _flags;
- Glib::ustring _take_id;
+ std::string _take_id;
int64_t timeline_position;
bool file_is_new;
uint16_t _channel;
bool _is_embedded;
- static bool determine_embeddedness(Glib::ustring path);
+ static bool determine_embeddedness(std::string path);
- static Glib::ustring peak_dir;
- static Glib::ustring search_path;
+ static std::string peak_dir;
+ static std::string search_path;
static char bwf_country_code[3];
static char bwf_organization_code[4];
@@ -174,8 +174,8 @@ class AudioFileSource : public AudioSource {
static Sample* get_interleave_buffer (nframes_t size);
private:
- Glib::ustring old_peak_path (Glib::ustring audio_path);
- Glib::ustring broken_peak_path (Glib::ustring audio_path);
+ std::string old_peak_path (std::string audio_path);
+ std::string broken_peak_path (std::string audio_path);
void fix_writable_flags ();
void prevent_deletion ();
diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index ef455f9735..15ebf79782 100644
--- a/libs/ardour/ardour/audiosource.h
+++ b/libs/ardour/ardour/audiosource.h
@@ -46,7 +46,7 @@ namespace ARDOUR {
class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR::AudioSource>
{
public:
- AudioSource (Session&, Glib::ustring name);
+ AudioSource (Session&, std::string name);
AudioSource (Session&, const XMLNode&);
virtual ~AudioSource ();
@@ -85,8 +85,8 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR:
virtual bool can_truncate_peaks() const { return true; }
- void set_captured_for (Glib::ustring str) { _captured_for = str; }
- Glib::ustring captured_for() const { return _captured_for; }
+ void set_captured_for (std::string str) { _captured_for = str; }
+ std::string captured_for() const { return _captured_for; }
uint32_t read_data_count() const { return _read_data_count; }
uint32_t write_data_count() const { return _write_data_count; }
@@ -103,7 +103,7 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR:
XMLNode& get_state ();
int set_state (const XMLNode&);
- int rename_peakfile (Glib::ustring newpath);
+ int rename_peakfile (std::string newpath);
void touch_peakfile ();
static void set_build_missing_peakfiles (bool yn) {
@@ -138,13 +138,13 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR:
mutable Glib::Mutex _lock;
mutable Glib::Mutex _peaks_ready_lock;
nframes_t _length;
- Glib::ustring peakpath;
- Glib::ustring _captured_for;
+ std::string peakpath;
+ std::string _captured_for;
mutable uint32_t _read_data_count; // modified in read()
mutable uint32_t _write_data_count; // modified in write()
- int initialize_peakfile (bool newfile, Glib::ustring path);
+ int initialize_peakfile (bool newfile, std::string path);
int build_peaks_from_scratch ();
int compute_and_write_peaks (Sample* buf, nframes_t first_frame, nframes_t cnt, bool force, bool intermediate_peaks_ready_signal);
void truncate_peakfile();
@@ -153,8 +153,8 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR:
virtual nframes_t read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const = 0;
virtual nframes_t write_unlocked (Sample *dst, nframes_t cnt) = 0;
- virtual Glib::ustring peak_path(Glib::ustring audio_path) = 0;
- virtual Glib::ustring find_broken_peakfile (Glib::ustring missing_peak_path, Glib::ustring audio_path) = 0;
+ virtual std::string peak_path(std::string audio_path) = 0;
+ virtual std::string find_broken_peakfile (std::string missing_peak_path, std::string audio_path) = 0;
void update_length (nframes_t pos, nframes_t cnt);
@@ -173,7 +173,7 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR:
Sample* peak_leftovers;
nframes_t peak_leftover_frame;
- bool file_changed (Glib::ustring path);
+ bool file_changed (std::string path);
};
}
diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h
index 8b95ecfd85..692d3e3513 100644
--- a/libs/ardour/ardour/configuration_vars.h
+++ b/libs/ardour/ardour/configuration_vars.h
@@ -182,4 +182,4 @@ CONFIG_VARIABLE (string, bwf_organization_code, "bwf-organization-code", "US")
/* these variables have custom set() methods (e.g. path globbing) */
-CONFIG_VARIABLE_SPECIAL(Glib::ustring, raid_path, "raid-path", "", path_expand)
+CONFIG_VARIABLE_SPECIAL(std::string, raid_path, "raid-path", "", path_expand)
diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index 41b1ba6a19..f87807b61c 100644
--- a/libs/ardour/ardour/plugin.h
+++ b/libs/ardour/ardour/plugin.h
@@ -56,8 +56,8 @@ class PluginInfo {
string name;
string category;
- Glib::ustring creator;
- Glib::ustring path;
+ std::string creator;
+ std::string path;
int32_t n_inputs;
int32_t n_outputs;
ARDOUR::PluginType type;
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index cd7e52cc08..eb47b4d2bd 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -267,7 +267,7 @@ class Session : public PBD::StatefulDestructible
int ensure_subdirs ();
- Glib::ustring peak_path (Glib::ustring) const;
+ std::string peak_path (std::string) const;
static string suffixed_search_path (std::string suffix, bool data);
static string control_protocol_path ();
@@ -617,7 +617,7 @@ class Session : public PBD::StatefulDestructible
uint32_t count;
SrcQuality quality;
volatile bool freeze;
- std::vector<Glib::ustring> paths;
+ std::vector<std::string> paths;
bool replace_existing_source;
/* result */
@@ -681,7 +681,7 @@ class Session : public PBD::StatefulDestructible
boost::shared_ptr<AudioFileSource> create_audio_source_for_session (ARDOUR::AudioDiskstream&, uint32_t which_channel, bool destructive);
boost::shared_ptr<Source> source_by_id (const PBD::ID&);
- boost::shared_ptr<Source> source_by_path_and_channel (const Glib::ustring&, uint16_t);
+ boost::shared_ptr<Source> source_by_path_and_channel (const std::string&, uint16_t);
/* playlist management */
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index dc83fc6ec1..878f612a14 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -30,11 +30,11 @@ class SndFileSource : public AudioFileSource {
public:
/* constructor to be called for existing external-to-session files */
- SndFileSource (Session&, Glib::ustring path, int chn, Flag flags);
+ SndFileSource (Session&, std::string path, int chn, Flag flags);
/* constructor to be called for new in-session files */
- SndFileSource (Session&, Glib::ustring path, SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate,
+ SndFileSource (Session&, std::string path, SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate,
Flag flags = SndFileSource::default_writable_flags);
/* constructor to be called for existing in-session files */
@@ -61,7 +61,7 @@ class SndFileSource : public AudioFileSource {
static void setup_standard_crossfades (nframes_t sample_rate);
static const AudioFileSource::Flag default_writable_flags;
- static int get_soundfile_info (const Glib::ustring& path, SoundFileInfo& _info, string& error_msg);
+ static int get_soundfile_info (const std::string& path, SoundFileInfo& _info, string& error_msg);
protected:
void set_header_timeline_position ();
diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h
index 17ca139fb1..85dfb6840c 100644
--- a/libs/ardour/ardour/utils.h
+++ b/libs/ardour/ardour/utils.h
@@ -37,7 +37,7 @@ bool string_is_affirmative (const std::string& str);
class XMLNode;
-Glib::ustring legalize_for_path (Glib::ustring);
+std::string legalize_for_path (std::string);
void elapsed_time_to_str (char *buf, uint32_t seconds);
std::ostream& operator<< (std::ostream& o, const ARDOUR::BBT_Time& bbt);
@@ -58,11 +58,11 @@ int cmp_nocase (const std::string& s, const std::string& s2);
int tokenize_fullpath (std::string fullpath, std::string& path, std::string& name);
-int touch_file(Glib::ustring path);
+int touch_file(std::string path);
-Glib::ustring path_expand (Glib::ustring);
-Glib::ustring region_name_from_path (Glib::ustring path, bool strip_channels, bool add_channel_suffix = false, uint32_t total = 0, uint32_t this_one = 0);
-bool path_is_paired (Glib::ustring path, Glib::ustring& pair_base);
+std::string path_expand (std::string);
+std::string region_name_from_path (std::string path, bool strip_channels, bool add_channel_suffix = false, uint32_t total = 0, uint32_t this_one = 0);
+bool path_is_paired (std::string path, std::string& pair_base);
void compute_equal_power_fades (nframes_t nframes, float* in, float* out);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 12:46:11 +0000