diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/audioengine.h | 18 | ||||
| -rw-r--r-- | libs/ardour/ardour/configuration.h | 67 | ||||
| -rw-r--r-- | libs/ardour/ardour/port.h | 12 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 12 | ||||
| -rw-r--r-- | libs/ardour/ardour/utils.h | 14 |
5 files changed, 63 insertions, 60 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index d349f5bae5..9fe3ce5424 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -102,24 +102,24 @@ class AudioEngine : public sigc::trackable virtual const char *what() const throw() { return "could not connect to engine backend"; } }; - Port *register_audio_input_port (const string& portname); - Port *register_audio_output_port (const string& portname); + Port *register_audio_input_port (const std::string& portname); + Port *register_audio_output_port (const std::string& portname); int unregister_port (Port *); - int connect (const string& source, const string& destination); - int disconnect (const string& source, const string& destination); + int connect (const std::string& source, const std::string& destination); + int disconnect (const std::string& source, const std::string& destination); int disconnect (Port *); - const char ** get_ports (const string& port_name_pattern, const string& type_name_pattern, uint32_t flags); + const char ** get_ports (const std::string& port_name_pattern, const std::string& type_name_pattern, uint32_t flags); uint32_t n_physical_outputs () const; uint32_t n_physical_inputs () const; - string get_nth_physical_output (uint32_t n) { + std::string get_nth_physical_output (uint32_t n) { return get_nth_physical (n, JackPortIsInput); } - string get_nth_physical_input (uint32_t n) { + std::string get_nth_physical_input (uint32_t n) { return get_nth_physical (n, JackPortIsOutput); } @@ -130,7 +130,7 @@ class AudioEngine : public sigc::trackable the return value */ - Port *get_port_by_name (const string& name, bool keep = true); + Port *get_port_by_name (const std::string& name, bool keep = true); enum TransportState { TransportStopped = JackTransportStopped, @@ -215,7 +215,7 @@ class AudioEngine : public sigc::trackable PortConnections port_connections; void remove_connections_for (Port*); - string get_nth_physical (uint32_t which, int flags); + std::string get_nth_physical (uint32_t which, int flags); static int _xrun_callback (void *arg); static int _graph_order_callback (void *arg); diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h index c0a1301318..8ae0c0f73a 100644 --- a/libs/ardour/ardour/configuration.h +++ b/libs/ardour/ardour/configuration.h @@ -29,8 +29,6 @@ #include <ardour/types.h> #include <ardour/stateful.h> -using std::string; - class XMLNode; namespace ARDOUR { @@ -42,21 +40,21 @@ class Configuration : public Stateful virtual ~Configuration(); struct MidiPortDescriptor { - string tag; - string device; - string type; - string mode; + std::string tag; + std::string device; + std::string type; + std::string mode; MidiPortDescriptor (const XMLNode&); XMLNode& get_state(); }; - std::map<string,MidiPortDescriptor *> midi_ports; + std::map<std::string,MidiPortDescriptor *> midi_ports; int load_state (); int save_state (); - XMLNode& option_node (const string &, const string &); + XMLNode& option_node (const std::string &, const std::string &); int set_state (const XMLNode&); XMLNode& get_state (void); @@ -76,8 +74,8 @@ class Configuration : public Stateful bool get_trace_midi_output (); void set_trace_midi_output (bool); - string get_raid_path(); - void set_raid_path(string); + std::string get_raid_path(); + void set_raid_path(std::string); uint32_t get_minimum_disk_io(); void set_minimum_disk_io(uint32_t); @@ -88,11 +86,11 @@ class Configuration : public Stateful bool does_hiding_groups_deactivates_groups(); void set_hiding_groups_deactivates_groups(bool); - string get_auditioner_output_left(); - void set_auditioner_output_left(string); + std::string get_auditioner_output_left(); + void set_auditioner_output_left(std::string); - string get_auditioner_output_right(); - void set_auditioner_output_right(string); + std::string get_auditioner_output_right(); + void set_auditioner_output_right(std::string); bool get_mute_affects_pre_fader(); void set_mute_affects_pre_fader (bool); @@ -112,14 +110,14 @@ class Configuration : public Stateful uint32_t get_disk_choice_space_threshold(); void set_disk_choice_space_threshold (uint32_t); - string get_mmc_port_name(); - void set_mmc_port_name(string); - - string get_mtc_port_name(); - void set_mtc_port_name(string); + std::string get_mmc_port_name(); + void set_mmc_port_name(std::string); - string get_midi_port_name(); - void set_midi_port_name(string); + std::string get_mtc_port_name(); + void set_mtc_port_name(std::string); + + std::string get_midi_port_name(); + void set_midi_port_name(std::string); uint32_t get_midi_feedback_interval_ms(); void set_midi_feedback_interval_ms (uint32_t); @@ -163,25 +161,28 @@ class Configuration : public Stateful bool get_timecode_source_is_synced (); void set_timecode_source_is_synced (bool); - string get_user_ardour_path (); - string get_system_ardour_path (); + std::string get_user_ardour_path (); + std::string get_system_ardour_path (); gain_t get_quieten_at_speed (); void set_quieten_at_speed (gain_t); + + std::string get_tape_dir (); + void set_tape_dir (std::string); private: void set_defaults (); - string get_system_path(); - string get_user_path(); + std::string get_system_path(); + std::string get_user_path(); /* this is subject to wordexp, so we need to keep the original (user-entered) form around. e.g. ~/blah-> /home/foo/blah */ - string raid_path; + std::string raid_path; bool raid_path_is_user; - string orig_raid_path; + std::string orig_raid_path; uint32_t minimum_disk_io_bytes; bool minimum_disk_io_bytes_is_user; @@ -189,9 +190,9 @@ class Configuration : public Stateful bool track_buffer_seconds_is_user; bool hiding_groups_deactivates_groups; bool hiding_groups_deactivates_groups_is_user; - string auditioner_output_left; + std::string auditioner_output_left; bool auditioner_output_left_is_user; - string auditioner_output_right; + std::string auditioner_output_right; bool auditioner_output_right_is_user; bool mute_affects_pre_fader; bool mute_affects_pre_fader_is_user; @@ -205,11 +206,11 @@ class Configuration : public Stateful bool solo_latch_is_user; uint32_t disk_choice_space_threshold; bool disk_choice_space_threshold_is_user; - string mtc_port_name; + std::string mtc_port_name; bool mtc_port_name_is_user; - string mmc_port_name; + std::string mmc_port_name; bool mmc_port_name_is_user; - string midi_port_name; + std::string midi_port_name; bool midi_port_name_is_user; bool use_hardware_monitoring; bool use_hardware_monitoring_is_user; @@ -248,6 +249,8 @@ class Configuration : public Stateful bool midi_feedback_interval_ms_is_user; bool latched_record_enable; bool latched_record_enable_is_user; + std::string tape_dir; + bool tape_dir_is_user; XMLNode *key_node; bool user_configuration; diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h index e5edcf72ac..ff9c25e1c4 100644 --- a/libs/ardour/ardour/port.h +++ b/libs/ardour/ardour/port.h @@ -53,15 +53,15 @@ class Port : public sigc::trackable { silent = false; } - string name() { + std::string name() { return _name; } - string short_name() { + std::string short_name() { return jack_port_short_name (port); } - int set_name (string str); + int set_name (std::string str); JackPortFlags flags() const { return _flags; @@ -79,7 +79,7 @@ class Port : public sigc::trackable { return jack_port_connected (port); } - bool connected_to (const string& portname) const { + bool connected_to (const std::string& portname) const { return jack_port_connected_to (port, portname.c_str()); } @@ -191,8 +191,8 @@ class Port : public sigc::trackable { */ JackPortFlags _flags; - string _type; - string _name; + std::string _type; + std::string _name; bool last_monitor : 1; bool silent : 1; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index d4ca8c1ddc..7f0bc57e7b 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -243,10 +243,11 @@ class Session : public sigc::trackable, public Stateful bool dirty() const { return _state_of_the_state & Dirty; } sigc::signal<void> DirtyChanged; - string sound_dir () const; - string peak_dir () const; - string dead_sound_dir () const; - string automation_dir () const; + std::string sound_dir () const; + std::string tape_dir () const; + std::string peak_dir () const; + std::string dead_sound_dir () const; + std::string automation_dir () const; static string template_path (); static string template_dir (); @@ -1618,10 +1619,11 @@ class Session : public sigc::trackable, public Stateful PBD::Lock space_lock; static const char* sound_dir_name; + static const char* tape_dir_name; static const char* dead_sound_dir_name; static const char* peak_dir_name; - string discover_best_sound_dir (); + string discover_best_sound_dir (bool destructive = false); int ensure_sound_dir (string, string&); void refresh_disk_space (); diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h index 36ee6f105f..2fc6fa6e50 100644 --- a/libs/ardour/ardour/utils.h +++ b/libs/ardour/ardour/utils.h @@ -29,13 +29,11 @@ class XMLNode; -using std::ostream; - void elapsed_time_to_str (char *buf, uint32_t seconds); -string legalize_for_path (std::string str); -ostream& operator<< (ostream& o, const ARDOUR::BBT_Time& bbt); +std::string legalize_for_path (std::string str); +std::ostream& operator<< (std::ostream& o, const ARDOUR::BBT_Time& bbt); XMLNode* find_named_node (const XMLNode& node, std::string name); -string placement_as_string (ARDOUR::Placement); +std::string placement_as_string (ARDOUR::Placement); static inline float f_max(float x, float a) { x -= a; @@ -48,12 +46,12 @@ static inline float f_max(float x, float a) { int cmp_nocase (const std::string& s, const std::string& s2); -int tokenize_fullpath (string fullpath, string& path, string& name); +int tokenize_fullpath (std::string fullpath, std::string& path, std::string& name); -int touch_file(string path); +int touch_file(std::string path); uint32_t long get_uid(); -string region_name_from_path (string path); +std::string region_name_from_path (std::string path); #endif /* __ardour_utils_h__ */ |