smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

Remove most using declarations from header files.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5069 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-05-12 17:03:42 +00:00
parent 2e5c935990
commit 3b89d9eaa0
198 changed files with 836 additions and 911 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/ardour_dialog.cc
View file

@ -29,6 +29,7 @@
#include "public_editor.h"
#include "utils.h"
using namespace std;
using namespace sigc;
using namespace Gtk;

2
gtk2_ardour/ardour_ui.cc
View file

@ -2325,7 +2325,7 @@ ARDOUR_UI::get_session_parameters (bool should_be_new)
if (likely_new) {
ustring existing = Glib::build_filename (session_path, session_name);
Glib::ustring existing = Glib::build_filename (session_path, session_name);
if (!ask_about_loading_existing_session (existing)) {
ARDOUR_COMMAND_LINE::session_name = ""; // cancel that

12
gtk2_ardour/ardour_ui.h
View file

@ -156,8 +156,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
int unload_session (bool hide_stuff = false);
void close_session();
int save_state_canfail (string state_name = "");
void save_state (const string & state_name = "");
int save_state_canfail (std::string state_name = "");
void save_state (const std::string & state_name = "");
static double gain_to_slider_position (ARDOUR::gain_t g);
static ARDOUR::gain_t slider_position_to_gain (double pos);
@ -185,7 +185,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
static sigc::signal<void> SuperRapidScreenUpdate;
static sigc::signal<void,nframes_t, bool, nframes_t> Clock;
void name_io_setup (ARDOUR::AudioEngine&, string&, ARDOUR::IO& io, bool in);
void name_io_setup (ARDOUR::AudioEngine&, std::string&, ARDOUR::IO& io, bool in);
XMLNode* editor_settings() const;
XMLNode* mixer_settings () const;
@ -283,7 +283,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
void startup ();
void shutdown ();
int ask_about_saving_session (const string & why);
int ask_about_saving_session (const std::string & why);
/* periodic safety backup, to be precise */
gint autosave_session();
@ -483,7 +483,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
void recent_session_row_activated (const Gtk::TreePath& path, Gtk::TreeViewColumn* col);
struct RecentSessionsSorter {
bool operator() (std::pair<string,string> a, std::pair<string,string> b) const {
bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const {
return cmp_nocase(a.first, b.first) == -1;
}
};
@ -627,7 +627,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
Gtk::MenuItem *cleanup_item;
void display_cleanup_results (ARDOUR::Session::cleanup_report& rep, const gchar* list_title, const string & msg);
void display_cleanup_results (ARDOUR::Session::cleanup_report& rep, const gchar* list_title, const std::string & msg);
void cleanup ();
void flush_trash ();

1
gtk2_ardour/audio_region_view.cc
View file

@ -56,6 +56,7 @@
#define MUTED_ALPHA 10
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;

6
gtk2_ardour/audio_region_view.h
View file

@ -125,8 +125,8 @@ class AudioRegionView : public RegionView
WaveformLogScaled = 0x10,
};
vector<ArdourCanvas::WaveView *> waves;
vector<ArdourCanvas::WaveView *> tmp_waves; ///< see ::create_waves()
std::vector<ArdourCanvas::WaveView *> waves;
std::vector<ArdourCanvas::WaveView *> tmp_waves; ///< see ::create_waves()
ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position
ArdourCanvas::SimpleLine* zero_line;
ArdourCanvas::Polygon* fade_in_shape;
@ -168,7 +168,7 @@ class AudioRegionView : public RegionView
void color_handler ();
vector<GnomeCanvasWaveViewCache*> wave_caches;
std::vector<GnomeCanvasWaveViewCache*> wave_caches;
private:

4
gtk2_ardour/audio_streamview.h
View file

@ -106,14 +106,14 @@ class AudioStreamView : public StreamView
double _amplitude_above_axis;
typedef list<CrossfadeView*> CrossfadeViewList;
typedef std::list<CrossfadeView*> CrossfadeViewList;
CrossfadeViewList crossfade_views;
bool crossfades_visible;
std::list<sigc::connection> rec_data_ready_connections;
nframes_t last_rec_data_frame;
map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
std::map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map;
bool outline_region;

1
gtk2_ardour/audio_time_axis.cc
View file

@ -69,6 +69,7 @@
#include "i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;

2
gtk2_ardour/audio_time_axis.h
View file

@ -86,7 +86,7 @@ class AudioTimeAxisView : public RouteTimeAxisView
void first_idle ();
XMLNode* get_child_xml_node (const string & childname);
XMLNode* get_child_xml_node (const std::string & childname);
void set_waveform_shape (Editing::WaveformShape);
void set_waveform_scale (Editing::WaveformScale);

12
gtk2_ardour/automation_line.h
View file

@ -55,7 +55,7 @@ namespace Gnome {
class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoingAway
{
public:
AutomationLine (const string& name, TimeAxisView&, ArdourCanvas::Group&,
AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&,
boost::shared_ptr<ARDOUR::AutomationList>,
const Evoral::TimeConverter<double, ARDOUR::sframes_t>* converter = 0);
virtual ~AutomationLine ();
@ -82,7 +82,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
ControlPoint* nth (uint32_t);
uint32_t npoints() const { return control_points.size(); }
string name() const { return _name; }
std::string name() const { return _name; }
bool visible() const { return _visible; }
guint32 height() const { return _height; }
@ -106,9 +106,9 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
void show_selection();
void hide_selection ();
string get_verbose_cursor_string (double) const;
string fraction_to_string (double) const;
double string_to_fraction (string const &) const;
std::string get_verbose_cursor_string (double) const;
std::string fraction_to_string (double) const;
double string_to_fraction (std::string const &) const;
void view_to_model_coord (double& x, double& y) const;
void model_to_view_coord (double& x, double& y) const;
@ -132,7 +132,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
protected:
string _name;
std::string _name;
guint32 _height;
uint32_t _line_color;

2
gtk2_ardour/automation_selection.h
View file

@ -26,6 +26,6 @@ namespace ARDOUR {
class AutomationList;
}
struct AutomationSelection : list< boost::shared_ptr<ARDOUR::AutomationList> > {};
struct AutomationSelection : std::list<boost::shared_ptr<ARDOUR::AutomationList> > {};
#endif /* __ardour_gtk_automation_selection_h__ */

1
gtk2_ardour/automation_time_axis.cc
View file

@ -40,6 +40,7 @@
#include "i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;

17
gtk2_ardour/automation_time_axis.h
View file

@ -20,7 +20,6 @@
#ifndef __ardour_gtk_automation_time_axis_h__
#define __ardour_gtk_automation_time_axis_h__
#include <vector>
#include <list>
#include <string>
#include <utility>
@ -36,10 +35,6 @@
#include "simplerect.h"
#include "automation_controller.h"
using std::vector;
using std::list;
using std::string;
namespace ARDOUR {
class Session;
class Route;
@ -67,8 +62,8 @@ class AutomationTimeAxisView : public TimeAxisView {
TimeAxisView& parent,
bool show_regions,
ArdourCanvas::Canvas& canvas,
const string & name, /* translatable */
const string & plug_name = "");
const std::string & name, /* translatable */
const std::string & plug_name = "");
~AutomationTimeAxisView();
@ -82,8 +77,8 @@ class AutomationTimeAxisView : public TimeAxisView {
boost::shared_ptr<AutomationLine> line() { return _line; }
void set_selected_points (PointSelection&);
void get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable *>&);
void get_inverted_selectables (Selection&, list<Selectable*>& results);
void get_selectables (nframes_t start, nframes_t end, double top, double bot, std::list<Selectable *>&);
void get_inverted_selectables (Selection&, std::list<Selectable*>& results);
void show_timestretch (nframes_t start, nframes_t end) {}
void hide_timestretch () {}
@ -100,7 +95,7 @@ class AutomationTimeAxisView : public TimeAxisView {
guint32 show_at (double y, int& nth, Gtk::VBox *parent);
void hide ();
static const string state_node_name;
static const std::string state_node_name;
XMLNode* get_state_node();
boost::shared_ptr<ARDOUR::AutomationControl> control() { return _control; }
@ -117,7 +112,7 @@ class AutomationTimeAxisView : public TimeAxisView {
boost::shared_ptr<AutomationLine> _line;
AutomationStreamView* _view;
string _name;
std::string _name;
bool ignore_toggle;
bool first_call_to_set_height;

2
gtk2_ardour/axis_view.cc
View file

@ -38,10 +38,10 @@
#include "axis_view.h"
#include "i18n.h"
using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
list<Gdk::Color> AxisView::used_colors;
AxisView::AxisView (ARDOUR::Session& sess) : _session(sess)

4
gtk2_ardour/axis_view.h
View file

@ -49,7 +49,7 @@ class AxisView : public virtual Selectable
ARDOUR::Session& session() const { return _session; }
virtual string name() const = 0;
virtual std::string name() const = 0;
virtual bool marked_for_display() const { return _marked_for_display; }
virtual void set_marked_for_display (bool yn) {
@ -79,7 +79,7 @@ class AxisView : public virtual Selectable
ARDOUR::Session& _session;
Gdk::Color _color;
static list<Gdk::Color> used_colors;
static std::list<Gdk::Color> used_colors;
Gtk::Label name_label;

12
gtk2_ardour/crossfade_edit.h
View file

@ -61,14 +61,14 @@ class CrossfadeEditor : public ArdourDialog
: x (a), y (b) {}
};
struct Preset : public list<PresetPoint> {
struct Preset : public std::list<PresetPoint> {
const char* name;
const char* image_name;
Preset (const char* n, const char* x) : name (n), image_name (x) {}
};
typedef list<Preset*> Presets;
typedef std::list<Preset*> Presets;
static Presets* fade_in_presets;
static Presets* fade_out_presets;
@ -108,10 +108,10 @@ class CrossfadeEditor : public ArdourDialog
struct Half {
ArdourCanvas::Line* line;
ArdourCanvas::Polygon* shading;
list<Point*> points;
std::list<Point*> points;
ARDOUR::AutomationList normative_curve; /* 0 - 1.0, linear */
ARDOUR::AutomationList gain_curve; /* 0 - 2.0, gain mapping */
vector<ArdourCanvas::WaveView*> waves;
std::vector<ArdourCanvas::WaveView*> waves;
Half();
};
@ -125,8 +125,8 @@ class CrossfadeEditor : public ArdourDialog
WhichFade current;
bool point_grabbed;
vector<Gtk::Button*> fade_out_buttons;
vector<Gtk::Button*> fade_in_buttons;
std::vector<Gtk::Button*> fade_out_buttons;
std::vector<Gtk::Button*> fade_in_buttons;
Gtk::VBox vpacker2;

58
gtk2_ardour/editor.h
View file

@ -507,7 +507,7 @@ class Editor : public PublicEditor
void hide();
void show ();
void set_name (const string&);
void set_name (const std::string&);
void set_position (nframes64_t start, nframes64_t end = 0);
void set_color_rgba (uint32_t);
};
@ -522,7 +522,7 @@ class Editor : public PublicEditor
void hide_marker (ArdourCanvas::Item*, GdkEvent*);
void clear_marker_display ();
void mouse_add_new_marker (nframes64_t where, bool is_cd=false, bool is_xrun=false);
bool choose_new_marker_name(string &name);
bool choose_new_marker_name(std::string &name);
void update_cd_marker_display ();
void ensure_cd_marker_updated (LocationMarkers * lam, ARDOUR::Location * location);
@ -546,9 +546,9 @@ class Editor : public PublicEditor
/* functions to be passed to mapover_tracks(), possibly with sigc::bind()-supplied arguments */
void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView*, vector<RegionView*>*) const;
void mapped_use_new_playlist (RouteTimeAxisView&, uint32_t, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
void mapped_use_copy_playlist (RouteTimeAxisView&, uint32_t, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView*, std::vector<RegionView*>*) const;
void mapped_use_new_playlist (RouteTimeAxisView&, uint32_t, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
void mapped_use_copy_playlist (RouteTimeAxisView&, uint32_t, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
void mapped_clear_playlist (RouteTimeAxisView&, uint32_t);
/* end */
@ -624,8 +624,8 @@ class Editor : public PublicEditor
bool track_canvas_motion (GdkEvent*);
void set_verbose_canvas_cursor (const string &, double x, double y);
void set_verbose_canvas_cursor_text (const string &);
void set_verbose_canvas_cursor (const std::string &, double x, double y);
void set_verbose_canvas_cursor_text (const std::string &);
void show_verbose_canvas_cursor();
void hide_verbose_canvas_cursor();
@ -866,7 +866,7 @@ class Editor : public PublicEditor
boost::shared_ptr<ARDOUR::Region> find_next_region (nframes64_t, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView ** = 0);
nframes64_t find_next_region_boundary (nframes64_t, int32_t dir, const TrackViewList&);
vector<nframes64_t> region_boundary_cache;
std::vector<nframes64_t> region_boundary_cache;
void build_region_boundary_cache ();
Gtk::HBox top_hbox;
@ -1127,7 +1127,7 @@ class Editor : public PublicEditor
int ensure_cursor (nframes64_t* pos);
void handle_new_region (boost::weak_ptr<ARDOUR::Region>);
void handle_new_regions (vector<boost::weak_ptr<ARDOUR::Region> >& );
void handle_new_regions (std::vector<boost::weak_ptr<ARDOUR::Region> >& );
void handle_region_removed (boost::weak_ptr<ARDOUR::Region>);
void add_region_to_region_display (boost::shared_ptr<ARDOUR::Region>);
void add_regions_to_region_display (std::vector<boost::weak_ptr<ARDOUR::Region> > & );
@ -1141,7 +1141,7 @@ class Editor : public PublicEditor
bool no_region_list_redisplay;
void insert_into_tmp_regionlist(boost::shared_ptr<ARDOUR::Region>);
list<boost::shared_ptr<ARDOUR::Region> > tmp_region_list;
std::list<boost::shared_ptr<ARDOUR::Region> > tmp_region_list;
void cut_copy (Editing::CutCopyOp);
bool can_cut_copy () const;
@ -1246,7 +1246,7 @@ class Editor : public PublicEditor
bool zoomed_to_region;
void temporal_zoom_session ();
void temporal_zoom (gdouble scale);
void temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & op);
void temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const std::string & op);
void temporal_zoom_to_frame (bool coarser, nframes64_t frame);
void amplitude_zoom (gdouble scale);
@ -1263,7 +1263,7 @@ class Editor : public PublicEditor
void external_audio_dialog ();
void session_import_dialog ();
int check_whether_and_how_to_import(string, bool all_or_nothing = true);
int check_whether_and_how_to_import(std::string, bool all_or_nothing = true);
bool check_multichannel_status (const std::vector<Glib::ustring>& paths);
SoundFileOmega* sfbrowser;
@ -1273,15 +1273,15 @@ class Editor : public PublicEditor
bool idle_drop_paths (std::vector<Glib::ustring> paths, nframes64_t frame, double ypos);
void drop_paths_part_two (const std::vector<Glib::ustring>& paths, nframes64_t frame, double ypos);
void do_import (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&);
void do_embed (vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, nframes64_t&);
void do_import (std::vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t&);
void do_embed (std::vector<Glib::ustring> paths, Editing::ImportDisposition, Editing::ImportMode mode, nframes64_t&);
int import_sndfiles (vector<Glib::ustring> paths, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t& pos,
int import_sndfiles (std::vector<Glib::ustring> paths, Editing::ImportMode mode, ARDOUR::SrcQuality, nframes64_t& pos,
int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>, bool, uint32_t total);
int embed_sndfiles (vector<Glib::ustring> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode,
int embed_sndfiles (std::vector<Glib::ustring> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode,
nframes64_t& pos, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&);
int add_sources (vector<Glib::ustring> paths, ARDOUR::SourceList& sources, nframes64_t& pos, Editing::ImportMode,
int add_sources (std::vector<Glib::ustring> paths, ARDOUR::SourceList& sources, nframes64_t& pos, Editing::ImportMode,
int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool add_channel_suffix);
int finish_bringing_in_material (boost::shared_ptr<ARDOUR::Region> region, uint32_t, uint32_t, nframes64_t& pos, Editing::ImportMode mode,
boost::shared_ptr<ARDOUR::Track>& existing_track);
@ -1324,7 +1324,7 @@ class Editor : public PublicEditor
/* to support this ... */
void import_audio (bool as_tracks);
void do_import (vector<Glib::ustring> paths, bool split, bool as_tracks);
void do_import (std::vector<Glib::ustring> paths, bool split, bool as_tracks);
void move_to_start ();
void move_to_end ();
@ -1412,7 +1412,7 @@ class Editor : public PublicEditor
/// Snap threshold in pixels
double snap_threshold;
void handle_gui_changes (const string &, void *);
void handle_gui_changes (const std::string &, void *);
bool ignore_gui_changes;
void hide_all_tracks (bool with_select);
@ -1653,7 +1653,7 @@ public:
Gtk::Menu* cd_marker_menu;
ArdourCanvas::Item* marker_menu_item;
typedef list<Marker*> Marks;
typedef std::list<Marker*> Marks;
Marks metric_marks;
void remove_metric_marks ();
@ -2074,23 +2074,23 @@ public:
/* audio export */
int write_region_selection(RegionSelection&);
bool write_region (string path, boost::shared_ptr<ARDOUR::AudioRegion>);
bool write_region (std::string path, boost::shared_ptr<ARDOUR::AudioRegion>);
void bounce_region_selection ();
void bounce_range_selection (bool replace, bool enable_processing);
void external_edit_region ();
int write_audio_selection (TimeSelection&);
bool write_audio_range (ARDOUR::AudioPlaylist&, const ARDOUR::ChanCount& channels, list<ARDOUR::AudioRange>&);
bool write_audio_range (ARDOUR::AudioPlaylist&, const ARDOUR::ChanCount& channels, std::list<ARDOUR::AudioRange>&);
void write_selection ();
XMLNode *before; /* used in *_reversible_command */
void begin_reversible_command (string cmd_name);
void begin_reversible_command (std::string cmd_name);
void commit_reversible_command ();
void update_title ();
void update_title_s (const string & snapshot_name);
void update_title_s (const std::string & snapshot_name);
struct State {
Selection* selection;
@ -2172,8 +2172,8 @@ public:
bool _xfade_visibility;
#ifdef WITH_CMT
void handle_new_imageframe_time_axis_view(const string & track_name, void* src) ;
void handle_new_imageframe_marker_time_axis_view(const string & track_name, TimeAxisView* marked_track) ;
void handle_new_imageframe_time_axis_view(const std::string & track_name, void* src) ;
void handle_new_imageframe_marker_time_axis_view(const std::string & track_name, TimeAxisView* marked_track) ;
void start_imageframe_grab(ArdourCanvas::Item*, GdkEvent*) ;
void start_markerview_grab(ArdourCanvas::Item*, GdkEvent*) ;
@ -2236,13 +2236,13 @@ public:
/* audio filters */
void apply_filter (ARDOUR::Filter&, string cmd);
void apply_filter (ARDOUR::Filter&, std::string cmd);
/* handling cleanup */
int playlist_deletion_dialog (boost::shared_ptr<ARDOUR::Playlist>);
vector<sigc::connection> session_connections;
std::vector<sigc::connection> session_connections;
/* tracking step changes of track height */
@ -2274,7 +2274,7 @@ public:
bool on_key_press_event (GdkEventKey*);
bool on_key_release_event (GdkEventKey*);
void session_state_saved (string);
void session_state_saved (std::string);
Glib::RefPtr<Gtk::Action> undo_action;
Glib::RefPtr<Gtk::Action> redo_action;

1
gtk2_ardour/editor_edit_groups.cc
View file

@ -35,6 +35,7 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;

1
gtk2_ardour/editor_mixer.cc
View file

@ -34,6 +34,7 @@
#include "i18n.h"
using namespace std;
using namespace Gtkmm2ext;
using namespace PBD;

1
gtk2_ardour/editor_region_list.cc
View file

@ -45,6 +45,7 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;

1
gtk2_ardour/editor_route_list.cc
View file

@ -39,6 +39,7 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;

1
gtk2_ardour/editor_selection_list.cc
View file

@ -38,6 +38,7 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;

2
gtk2_ardour/engine_dialog.h
View file

@ -83,7 +83,7 @@ class EngineControl : public Gtk::VBox {
std::map<std::string,std::vector<std::string> > devices;
std::vector<std::string> backend_devs;
void enumerate_devices (const string& driver);
void enumerate_devices (const std::string& driver);
#ifdef __APPLE__
std::vector<std::string> enumerate_coreaudio_devices ();

2
gtk2_ardour/export_channel_selector.cc
View file

@ -37,6 +37,8 @@
#include "i18n.h"
using namespace std;
using namespace Glib;
using namespace ARDOUR;
using namespace PBD;

2
gtk2_ardour/export_dialog.cc
View file

@ -234,7 +234,7 @@ ExportDialog::update_warnings ()
if (!warnings->conflicting_filenames.empty()) {
list_files_hbox.show ();
for (std::list<Glib::ustring>::iterator it = warnings->conflicting_filenames.begin(); it != warnings->conflicting_filenames.end(); ++it) {
ustring::size_type pos = it->find_last_of ("/");
Glib::ustring::size_type pos = it->find_last_of ("/");
list_files_string += "\n" + it->substr (0, pos + 1) + "<b>" + it->substr (pos + 1) + "</b>";
}
}

1
gtk2_ardour/export_multiplicator.h
View file

@ -35,7 +35,6 @@
#include <gtkmm.h>
#include <boost/shared_ptr.hpp>
using std::list;
using ARDOUR::ExportProfileManager;
class ExportMultiplicator : public Gtk::EventBox {

1
gtk2_ardour/export_timespan_selector.cc
View file

@ -36,6 +36,7 @@
#include "i18n.h"
using namespace Glib;
using namespace ARDOUR;
using namespace PBD;

1
gtk2_ardour/ghostregion.cc
View file

@ -29,6 +29,7 @@
#include "simplerect.h"
#include "waveview.h"
using namespace std;
using namespace Editing;
using namespace ArdourCanvas;
using namespace ARDOUR;

2
gtk2_ardour/keyboard.h
View file

@ -33,8 +33,6 @@
#include "selection.h"
using std::string;
class Keyboard : public sigc::trackable, PBD::Stateful
{
public:

1
gtk2_ardour/location_ui.cc
View file

@ -38,6 +38,7 @@
#include "i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;

1
gtk2_ardour/main.cc
View file

@ -50,6 +50,7 @@
#include "i18n.h"
using namespace std;
using namespace Gtk;
using namespace ARDOUR_COMMAND_LINE;
using namespace ARDOUR;

1
gtk2_ardour/marker.cc
View file

@ -29,6 +29,7 @@
#include "i18n.h"
using namespace std;
using namespace ARDOUR;
Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation,

8
gtk2_ardour/marker.h
View file

@ -50,7 +50,7 @@ class Marker : public PBD::Destructible
};
Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, Type,
Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, Type,
nframes_t frame = 0, bool handle_events = true);
virtual ~Marker ();
@ -63,7 +63,7 @@ class Marker : public PBD::Destructible
void set_line_vpos (double y_origin, double height);
void set_position (nframes_t);
void set_name (const string&);
void set_name (const std::string&);
void set_color_rgba (uint32_t rgba);
nframes64_t position() const { return frame_position; }
@ -98,7 +98,7 @@ class Marker : public PBD::Destructible
class TempoMarker : public Marker
{
public:
TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&);
TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
~TempoMarker ();
ARDOUR::TempoSection& tempo() const { return _tempo; }
@ -110,7 +110,7 @@ class TempoMarker : public Marker
class MeterMarker : public Marker
{
public:
MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&);
MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }

4
gtk2_ardour/midi_streamview.h
View file

@ -58,8 +58,8 @@ class MidiStreamView : public StreamView
~MidiStreamView ();
void set_selected_regionviews (RegionSelection&);
void get_selectables (jack_nframes_t start, jack_nframes_t end, list<Selectable* >&);
void get_inverted_selectables (Selection&, list<Selectable* >& results);
void get_selectables (jack_nframes_t start, jack_nframes_t end, std::list<Selectable* >&);
void get_inverted_selectables (Selection&, std::list<Selectable* >& results);
enum VisibleNoteRange {
FullRange,

4
gtk2_ardour/midi_time_axis.h
View file

@ -82,12 +82,12 @@ class MidiTimeAxisView : public RouteTimeAxisView
return _channel_selector.mode_changed;
}
sigc::signal<void, string, string>& signal_midi_patch_settings_changed() {
sigc::signal<void, std::string, std::string>& signal_midi_patch_settings_changed() {
return _midi_patch_settings_changed;
}
private:
sigc::signal<void, string, string> _midi_patch_settings_changed;
sigc::signal<void, std::string, std::string> _midi_patch_settings_changed;
void model_changed();
void custom_device_mode_changed();

2
gtk2_ardour/mixer_strip.h
View file

@ -231,7 +231,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
Gtk::Style *passthru_style;
void route_gui_changed (string, void*);
void route_gui_changed (std::string, void*);
void show_route_color ();
void show_passthru_color ();

2
gtk2_ardour/mixer_ui.h
View file

@ -115,7 +115,7 @@ class Mixer_UI : public Gtk::Window
void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
list<MixerStrip *> strips;
std::list<MixerStrip *> strips;
bool strip_scroller_button_release (GdkEventButton*);

4
gtk2_ardour/option_editor.h
View file

@ -189,8 +189,8 @@ class OptionEditor : public ArdourDialog
void setup_click_editor ();
void clear_click_editor ();
void click_chosen (const string & paths);
void click_emphasis_chosen (const string & paths);
void click_chosen (const std::string & paths);
void click_emphasis_chosen (const std::string & paths);
void click_browse_clicked ();
void click_emphasis_browse_clicked ();

8
gtk2_ardour/opts.h
View file

@ -23,21 +23,19 @@
#include <string>
#include <glibmm/ustring.h>
using std::string;
namespace ARDOUR_COMMAND_LINE {
extern string session_name;
extern std::string session_name;
extern bool show_key_actions;
extern bool no_splash;
extern bool just_version;
extern string jack_client_name;
extern std::string jack_client_name;
extern bool use_vst;
extern bool new_session;
extern char* curvetest_file;
extern bool try_hw_optimization;
extern bool use_gtk_theme;
extern string keybindings_path;
extern std::string keybindings_path;
extern Glib::ustring menus_file;
extern bool finder_invoked_ardour;

4
gtk2_ardour/panner2d.h
View file

@ -22,7 +22,6 @@
#include <sys/types.h>
#include <map>
#include <string>
#include <vector>
#include <glibmm/refptr.h>
@ -33,9 +32,6 @@
#include <gtkmm/spinbutton.h>
#include <gtkmm/adjustment.h>
using std::map;
using std::string;
namespace ARDOUR {
class Panner;
}

1
gtk2_ardour/panner_ui.cc
View file

@ -39,6 +39,7 @@
#include "i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtkmm2ext;

2
gtk2_ardour/panner_ui.h
View file

@ -70,7 +70,7 @@ class PannerUI : public Gtk::HBox
void effective_pan_display ();
void set_meter_strip_name (string name);
void set_meter_strip_name (std::string name);
boost::shared_ptr<PBD::Controllable> get_controllable();
private:

2
gtk2_ardour/playlist_selection.h
View file

@ -27,6 +27,6 @@ namespace ARDOUR {
class Playlist;
}
struct PlaylistSelection : list<boost::shared_ptr<ARDOUR::Playlist> > {};
struct PlaylistSelection : std::list<boost::shared_ptr<ARDOUR::Playlist> > {};
#endif /* __ardour_gtk_playlist_selection_h__ */

4
gtk2_ardour/plugin_ui.h
View file

@ -178,7 +178,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
/* input */
Gtk::ComboBoxText* combo;
std::map<string, float>* combo_map;
std::map<std::string, float>* combo_map;
Gtk::ToggleButton* button;
boost::shared_ptr<AutomationController> controller;
Gtkmm2ext::ClickBox* clickbox;
@ -207,7 +207,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
void build ();
ControlUI* build_control_ui (guint32 port_index, boost::shared_ptr<ARDOUR::AutomationControl>);
std::vector<string> setup_scale_values(guint32 port_index, ControlUI* cui);
std::vector<std::string> setup_scale_values(guint32 port_index, ControlUI* cui);
void parameter_changed (ControlUI* cui);
void toggle_parameter_changed (ControlUI* cui);
void update_control_display (ControlUI* cui);

1
gtk2_ardour/processor_box.cc
View file

@ -74,6 +74,7 @@
class AUPluginUI;
#endif
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;

6
gtk2_ardour/processor_box.h
View file

@ -141,7 +141,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
Gtk::Menu *processor_menu;
gint processor_menu_map_handler (GdkEventAny *ev);
Gtk::Menu * build_processor_menu ();
void build_processor_tooltip (Gtk::EventBox&, string);
void build_processor_tooltip (Gtk::EventBox&, std::string);
void show_processor_menu (gint arg);
void choose_send ();
@ -162,7 +162,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
void row_deleted (const Gtk::TreeModel::Path& path);
void show_processor_active (boost::weak_ptr<ARDOUR::Processor>);
void show_processor_name (boost::weak_ptr<ARDOUR::Processor>);
string processor_name (boost::weak_ptr<ARDOUR::Processor>);
std::string processor_name (boost::weak_ptr<ARDOUR::Processor>);
void remove_processor_gui (boost::shared_ptr<ARDOUR::Processor>);
@ -185,7 +185,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
void clear_processors ();
void rename_processors ();
typedef vector<boost::shared_ptr<ARDOUR::Processor> > ProcSelection;
typedef std::vector<boost::shared_ptr<ARDOUR::Processor> > ProcSelection;
void for_selected_processors (void (ProcessorBox::*pmf)(boost::shared_ptr<ARDOUR::Processor>));
void get_selected_processors (ProcSelection&);

2
gtk2_ardour/region_gain_line.h
View file

@ -35,7 +35,7 @@ class AudioRegionView;
class AudioRegionGainLine : public AutomationLine
{
public:
AudioRegionGainLine (const string & name, ARDOUR::Session&, AudioRegionView&, ArdourCanvas::Group& parent, boost::shared_ptr<ARDOUR::AutomationList>);
AudioRegionGainLine (const std::string & name, ARDOUR::Session&, AudioRegionView&, ArdourCanvas::Group& parent, boost::shared_ptr<ARDOUR::AutomationList>);
void start_drag (ControlPoint*, nframes_t x, float fraction);
void end_drag (ControlPoint*);

1
gtk2_ardour/region_selection.cc
View file

@ -24,6 +24,7 @@
#include "region_selection.h"
#include "time_axis_view.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace sigc;

5
gtk2_ardour/region_selection.h
View file

@ -24,9 +24,6 @@
#include <sigc++/signal.h>
#include "ardour/types.h"
using std::list;
using std::set;
class RegionView;
class TimeAxisView;
@ -71,7 +68,7 @@ class RegionSelection : public std::list<RegionView*>, public sigc::trackable
nframes_t _current_start; ///< start position for the selection
nframes_t _current_end; ///< end position for the selection
list<RegionView *> _bylayer; ///< list of regions sorted by layer
std::list<RegionView *> _bylayer; ///< list of regions sorted by layer
};
#endif /* __ardour_gtk_region_selection_h__ */

1
gtk2_ardour/region_view.cc
View file

@ -49,6 +49,7 @@
#include "i18n.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
using namespace PBD;

3
gtk2_ardour/return_ui.cc
View file

@ -28,6 +28,7 @@
#include "ardour_ui.h"
#include "gui_thread.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
@ -114,7 +115,7 @@ ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> s, Session& ss)
mem_fun (*this, &ReturnUIWindow::return_going_away));
signal_delete_event().connect (bind (
ptr_fun (just_hide_it),
sigc::ptr_fun (just_hide_it),
reinterpret_cast<Window *> (this)));
}

1
gtk2_ardour/route_processor_selection.cc
View file

@ -29,6 +29,7 @@
#include "i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace sigc;

24
gtk2_ardour/route_time_axis.h
View file

@ -83,8 +83,8 @@ public:
void selection_click (GdkEventButton*);
void set_selected_points (PointSelection&);
void set_selected_regionviews (RegionSelection&);
void get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable *>&);
void get_inverted_selectables (Selection&, list<Selectable*>&);
void get_selectables (nframes_t start, nframes_t end, double top, double bot, std::list<Selectable *>&);
void get_inverted_selectables (Selection&, std::list<Selectable*>&);
bool show_automation(Evoral::Parameter param);
void set_layer_display (LayerDisplay d);
LayerDisplay layer_display () const;
@ -99,12 +99,12 @@ public:
TimeAxisView::Children get_child_list();
/* The editor calls these when mapping an operation across multiple tracks */
void use_new_playlist (bool prompt, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
void use_copy_playlist (bool prompt, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
void use_new_playlist (bool prompt, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
void use_copy_playlist (bool prompt, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
void clear_playlist ();
/* group playlist name resolving */
std::string resolve_new_group_playlist_name(std::string &, vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
std::string resolve_new_group_playlist_name(std::string &, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
void build_playlist_menu (Gtk::Menu *);
@ -131,12 +131,12 @@ public:
XMLNode* get_automation_child_xml_node (Evoral::Parameter param) { return RouteUI::get_automation_child_xml_node (param); }
typedef map<Evoral::Parameter, RouteAutomationNode*> AutomationTracks;
typedef std::map<Evoral::Parameter, RouteAutomationNode*> AutomationTracks;
AutomationTracks automation_tracks() { return _automation_tracks; }
boost::shared_ptr<AutomationTimeAxisView> automation_child(Evoral::Parameter param);
string name() const;
std::string name() const;
StreamView* view() const { return _view; }
ARDOUR::RouteGroup* edit_group() const;
boost::shared_ptr<ARDOUR::Playlist> playlist() const;
@ -171,7 +171,7 @@ protected:
boost::shared_ptr<ARDOUR::Processor> processor;
bool valid;
Gtk::Menu* menu;
vector<ProcessorAutomationNode*> lines;
std::vector<ProcessorAutomationNode*> lines;
ProcessorAutomationInfo (boost::shared_ptr<ARDOUR::Processor> i)
: processor (i), valid (true), menu (0) {}
@ -302,9 +302,9 @@ protected:
void _set_track_mode (ARDOUR::Track* track, ARDOUR::TrackMode mode, Gtk::RadioMenuItem* reset_item, Gtk::RadioMenuItem* reset_item_2);
void track_mode_changed ();
list<ProcessorAutomationInfo*> processor_automation;
std::list<ProcessorAutomationInfo*> processor_automation;
typedef vector<boost::shared_ptr<AutomationLine> > ProcessorAutomationCurves;
typedef std::vector<boost::shared_ptr<AutomationLine> > ProcessorAutomationCurves;
ProcessorAutomationCurves processor_automation_curves;
// Set from XML so context menu automation buttons can be correctly initialized
@ -323,9 +323,9 @@ protected:
XMLNode* underlay_xml_node;
bool set_underlay_state();
typedef list<StreamView*> UnderlayList;
typedef std::list<StreamView*> UnderlayList;
UnderlayList _underlay_streams;
typedef list<RouteTimeAxisView*> UnderlayMirrorList;
typedef std::list<RouteTimeAxisView*> UnderlayMirrorList;
UnderlayMirrorList _underlay_mirrors;
};

10
gtk2_ardour/route_ui.h
View file

@ -65,7 +65,7 @@ class RouteUI : public virtual AxisView
boost::shared_ptr<ARDOUR::Diskstream> get_diskstream() const;
string name() const;
std::string name() const;
// protected: XXX sigh this should be here
@ -83,8 +83,8 @@ class RouteUI : public virtual AxisView
BindableToggleButton* solo_button;
BindableToggleButton* rec_enable_button;
virtual string solo_button_name () const { return "SoloButton"; }
virtual string safe_solo_button_name () const { return "SafeSoloButton"; }
virtual std::string solo_button_name () const { return "SoloButton"; }
virtual std::string safe_solo_button_name () const { return "SafeSoloButton"; }
Gtk::Menu* mute_menu;
Gtk::Menu* solo_menu;
@ -164,8 +164,8 @@ class RouteUI : public virtual AxisView
void set_remote_control_id (uint32_t id, Gtk::CheckMenuItem* item);
void reversibly_apply_route_boolean (string name, void (ARDOUR::Route::*func)(bool, void*), bool, void *);
void reversibly_apply_track_boolean (string name, void (ARDOUR::Track::*func)(bool, void*), bool, void *);
void reversibly_apply_route_boolean (std::string name, void (ARDOUR::Route::*func)(bool, void*), bool, void *);
void reversibly_apply_track_boolean (std::string name, void (ARDOUR::Track::*func)(bool, void*), bool, void *);
void adjust_latency ();
void save_as_template ();

1
gtk2_ardour/selection.cc
View file

@ -33,6 +33,7 @@
#include "i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace sigc;

2
gtk2_ardour/selection.h
View file

@ -148,7 +148,7 @@ class Selection : public sigc::trackable
void remove (boost::shared_ptr<ARDOUR::AutomationList>);
void remove (boost::shared_ptr<ARDOUR::Playlist>);
void remove (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
void remove (const list<Selectable*>&);
void remove (const std::list<Selectable*>&);
void remove (Marker*);
void replace (uint32_t time_index, nframes_t start, nframes_t end);

3
gtk2_ardour/send_ui.cc
View file

@ -28,6 +28,7 @@
#include "ardour_ui.h"
#include "gui_thread.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
@ -132,7 +133,7 @@ SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session& ss)
mem_fun (*this, &SendUIWindow::send_going_away));
signal_delete_event().connect (bind (
ptr_fun (just_hide_it),
sigc::ptr_fun (just_hide_it),
reinterpret_cast<Window *> (this)));
}

1
gtk2_ardour/session_import_dialog.cc
View file

@ -34,6 +34,7 @@
#include "prompter.h"
#include "i18n.h"
using namespace std;
using namespace ARDOUR;
SessionImportDialog::SessionImportDialog (ARDOUR::Session & target) :

10
gtk2_ardour/session_import_dialog.h
View file

@ -34,8 +34,6 @@
#include "ardour_dialog.h"
using std::string;
namespace ARDOUR {
class Session;
}
@ -56,16 +54,16 @@ class SessionImportDialog : public ArdourDialog
private:
void load_session (const string& filename);
void load_session (const std::string& filename);
void fill_list ();
void browse ();
void do_merge ();
void end_dialog ();
void update (string path);
void update (std::string path);
void show_info(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
std::pair<bool, string> open_rename_dialog (string text, string name);
bool open_prompt_dialog (string text);
std::pair<bool, std::string> open_rename_dialog (std::string text, std::string name);
bool open_prompt_dialog (std::string text);
// Data
HandlerList handlers;

3
gtk2_ardour/session_metadata_dialog.cc
View file

@ -30,6 +30,9 @@
#include "ardour/session_directory.h"
#include "ardour/session_utils.h"
using namespace std;
using namespace Glib;
#define CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember))
/*** MetadataField ***/

43
gtk2_ardour/session_metadata_dialog.h
View file

@ -30,24 +30,21 @@
#include "ardour/session_metadata.h"
using std::string;
using Glib::ustring;
class MetadataField;
typedef boost::shared_ptr<MetadataField> MetadataPtr;
/// Wraps a metadata field to be used in a GUI
class MetadataField {
public:
MetadataField (ustring const & field_name);
MetadataField (Glib::ustring const & field_name);
virtual ~MetadataField();
virtual MetadataPtr copy () = 0;
virtual void save_data (ARDOUR::SessionMetadata & data) const = 0;
virtual void load_data (ARDOUR::SessionMetadata const & data) = 0;
virtual ustring name() { return _name; }
virtual ustring value() { return _value; }
virtual Glib::ustring name() { return _name; }
virtual Glib::ustring value() { return _value; }
/// Get widget containing name of field
virtual Gtk::Widget & name_widget () = 0;
@ -56,17 +53,17 @@ class MetadataField {
/// Get widget for editing value
virtual Gtk::Widget & edit_widget () = 0;
protected:
ustring _name;
ustring _value;
Glib::ustring _name;
Glib::ustring _value;
};
/// MetadataField that contains text
class TextMetadataField : public MetadataField {
private:
typedef ustring (ARDOUR::SessionMetadata::*Getter) () const;
typedef void (ARDOUR::SessionMetadata::*Setter) (ustring const &);
typedef Glib::ustring (ARDOUR::SessionMetadata::*Getter) () const;
typedef void (ARDOUR::SessionMetadata::*Setter) (Glib::ustring const &);
public:
TextMetadataField (Getter getter, Setter setter, ustring const & field_name, guint width = 50);
TextMetadataField (Getter getter, Setter setter, Glib::ustring const & field_name, guint width = 50);
MetadataPtr copy ();
void save_data (ARDOUR::SessionMetadata & data) const;
@ -94,7 +91,7 @@ class NumberMetadataField : public MetadataField {
typedef uint32_t (ARDOUR::SessionMetadata::*Getter) () const;
typedef void (ARDOUR::SessionMetadata::*Setter) (uint32_t);
public:
NumberMetadataField (Getter getter, Setter setter, ustring const & field_name, guint numbers, guint width = 50);
NumberMetadataField (Getter getter, Setter setter, Glib::ustring const & field_name, guint numbers, guint width = 50);
MetadataPtr copy ();
void save_data (ARDOUR::SessionMetadata & data) const;
@ -105,8 +102,8 @@ class NumberMetadataField : public MetadataField {
Gtk::Widget & edit_widget ();
private:
void update_value ();
ustring uint_to_str (uint32_t i) const;
uint32_t str_to_uint (ustring const & str) const;
Glib::ustring uint_to_str (uint32_t i) const;
uint32_t str_to_uint (Glib::ustring const & str) const;
Getter getter;
Setter setter;
@ -122,7 +119,7 @@ class NumberMetadataField : public MetadataField {
/// Interface for MetadataFields
class SessionMetadataSet {
public:
SessionMetadataSet (ustring const & name);
SessionMetadataSet (Glib::ustring const & name);
virtual ~SessionMetadataSet () {};
void add_data_field (MetadataPtr field);
@ -140,14 +137,14 @@ class SessionMetadataSet {
protected:
typedef std::list<MetadataPtr> DataList;
DataList list;
ustring name;
Glib::ustring name;
ARDOUR::Session *session;
};
/// Contains MetadataFields for editing
class SessionMetadataSetEditable : public SessionMetadataSet {
public:
SessionMetadataSetEditable (ustring const & name);
SessionMetadataSetEditable (Glib::ustring const & name);
Gtk::Widget & get_widget () { return table; }
Gtk::Widget & get_tab_widget ();
@ -165,7 +162,7 @@ class SessionMetadataSetEditable : public SessionMetadataSet {
/// Contains MetadataFields for importing
class SessionMetadataSetImportable : public SessionMetadataSet {
public:
SessionMetadataSetImportable (ustring const & name);
SessionMetadataSetImportable (Glib::ustring const & name);
Gtk::Widget & get_widget () { return tree_view; }
Gtk::Widget & get_tab_widget ();
@ -183,8 +180,8 @@ class SessionMetadataSetImportable : public SessionMetadataSet {
struct Columns : public Gtk::TreeModel::ColumnRecord
{
public:
Gtk::TreeModelColumn<ustring> field;
Gtk::TreeModelColumn<ustring> values;
Gtk::TreeModelColumn<Glib::ustring> field;
Gtk::TreeModelColumn<Glib::ustring> values;
Gtk::TreeModelColumn<bool> import;
Gtk::TreeModelColumn<MetadataPtr> data;
@ -199,7 +196,7 @@ class SessionMetadataSetImportable : public SessionMetadataSet {
Gtk::CheckButton select_all_check;
void select_all ();
void selection_changed (ustring const & path);
void selection_changed (Glib::ustring const & path);
};
/// Metadata dialog interface
@ -211,7 +208,7 @@ template <typename DataSet>
class SessionMetadataDialog : public ArdourDialog
{
public:
SessionMetadataDialog (ustring const & name);
SessionMetadataDialog (Glib::ustring const & name);
protected:
void init_data ();
@ -222,7 +219,7 @@ class SessionMetadataDialog : public ArdourDialog
virtual void save_and_close ();
virtual void end_dialog ();
void warn_user (ustring const & string);
void warn_user (Glib::ustring const & string);
typedef std::list<Gtk::Widget *> WidgetList;
typedef boost::shared_ptr<WidgetList> WidgetListPtr;

1
gtk2_ardour/splash.cc
View file

@ -12,6 +12,7 @@
using namespace Gtk;
using namespace Glib;
using namespace PBD;
using namespace std;
using namespace ARDOUR;

1
gtk2_ardour/streamview.cc
View file

@ -41,6 +41,7 @@
#include "gui_thread.h"
#include "utils.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;

14
gtk2_ardour/streamview.h
View file

@ -89,8 +89,8 @@ public:
void foreach_regionview (sigc::slot<void,RegionView*> slot);
void set_selected_regionviews (RegionSelection&);
void get_selectables (nframes_t start, nframes_t end, list<Selectable* >&);
void get_inverted_selectables (Selection&, list<Selectable* >& results);
void get_selectables (nframes_t start, nframes_t end, std::list<Selectable* >&);
void get_inverted_selectables (Selection&, std::list<Selectable* >& results);
virtual void update_contents_metrics(boost::shared_ptr<ARDOUR::Region> r) {}
void add_region_view (boost::shared_ptr<ARDOUR::Region>);
@ -135,14 +135,14 @@ protected:
ArdourCanvas::Group* canvas_group;
ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */
typedef list<RegionView* > RegionViewList;
typedef std::list<RegionView* > RegionViewList;
RegionViewList region_views;
double _samples_per_unit;
sigc::connection screen_update_connection;
vector<RecBoxInfo> rec_rects;
list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions;
std::vector<RecBoxInfo> rec_rects;
std::list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions;
bool rec_updating;
bool rec_active;
bool use_rec_regions;
@ -150,7 +150,7 @@ protected:
Gdk::Color region_color; ///< Contained region color
uint32_t stream_base_color; ///< Background color
vector<sigc::connection> playlist_connections;
std::vector<sigc::connection> playlist_connections;
sigc::connection playlist_change_connection;
ARDOUR::layer_t _layers;
@ -158,7 +158,7 @@ protected:
double height;
list<sigc::connection> rec_data_ready_connections;
std::list<sigc::connection> rec_data_ready_connections;
jack_nframes_t last_rec_data_frame;
private:

1
gtk2_ardour/tempo_dialog.cc
View file

@ -27,6 +27,7 @@
#include "i18n.h"
using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace ARDOUR;

12
gtk2_ardour/tempo_dialog.h
View file

@ -38,7 +38,7 @@
struct TempoDialog : public ArdourDialog
{
Gtk::ComboBoxText note_types;
vector<string> strings;
std::vector<std::string> strings;
Gtk::Adjustment bpm_adjustment;
Gtk::SpinButton bpm_spinner;
Gtk::Frame bpm_frame;
@ -54,8 +54,8 @@ struct TempoDialog : public ArdourDialog
Gtk::Frame when_frame;
char buf[64];
TempoDialog (ARDOUR::TempoMap&, nframes_t, const string & action);
TempoDialog (ARDOUR::TempoSection&, const string & action);
TempoDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action);
TempoDialog (ARDOUR::TempoSection&, const std::string & action);
double get_bpm ();
double get_note_type ();
@ -74,7 +74,7 @@ struct MeterDialog : public ArdourDialog
{
Gtk::Entry bpb_entry;
Gtk::ComboBoxText note_types;
vector<string> strings;
std::vector<std::string> strings;
Gtk::Frame bpb_frame;
Gtk::Button ok_button;
Gtk::Button cancel_button;
@ -82,8 +82,8 @@ struct MeterDialog : public ArdourDialog
Gtk::Frame when_frame;
char buf[64];
MeterDialog (ARDOUR::TempoMap&, nframes_t, const string & action);
MeterDialog (ARDOUR::MeterSection&, const string & action);
MeterDialog (ARDOUR::TempoMap&, nframes_t, const std::string & action);
MeterDialog (ARDOUR::MeterSection&, const std::string & action);
double get_bpb ();
double get_note_type ();

1
gtk2_ardour/time_axis_view.cc
View file

@ -54,6 +54,7 @@
#include "i18n.h"
using namespace std;
using namespace Gtk;
using namespace Gdk;
using namespace sigc;

14
gtk2_ardour/time_axis_view.h
View file

@ -193,8 +193,8 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
void order_selection_trims (ArdourCanvas::Item *item, bool put_start_on_top);
virtual void get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results);
virtual void get_inverted_selectables (Selection&, list<Selectable *>& results);
virtual void get_selectables (nframes_t start, nframes_t end, double top, double bot, std::list<Selectable*>& results);
virtual void get_inverted_selectables (Selection&, std::list<Selectable *>& results);
void add_ghost (RegionView*);
void remove_ghost (RegionView*);
@ -233,8 +233,8 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
uint32_t height; /* in canvas units */
string controls_base_unselected_name;
string controls_base_selected_name;
std::string controls_base_unselected_name;
std::string controls_base_selected_name;
bool name_entry_button_press (GdkEventButton *ev);
bool name_entry_button_release (GdkEventButton *ev);
@ -310,10 +310,10 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
ArdourCanvas::Group *selection_group;
list<GhostRegion*> ghosts;
std::list<GhostRegion*> ghosts;
list<SelectionRect*> free_selection_rects;
list<SelectionRect*> used_selection_rects;
std::list<SelectionRect*> free_selection_rects;
std::list<SelectionRect*> used_selection_rects;
SelectionRect* get_selection_rect(uint32_t id);

2
gtk2_ardour/track_selection.h
View file

@ -24,6 +24,6 @@
class TimeAxisView;
struct TrackSelection : public list<TimeAxisView*> {};
struct TrackSelection : public std::list<TimeAxisView*> {};
#endif /* __ardour_gtk_track_selection_h__ */

6
libs/ardour/ardour/audio_diskstream.h
View file

@ -55,14 +55,14 @@ class IO;
class AudioDiskstream : public Diskstream
{
public:
AudioDiskstream (Session &, const string& name, Diskstream::Flag f = Recordable);
AudioDiskstream (Session &, const std::string& name, Diskstream::Flag f = Recordable);
AudioDiskstream (Session &, const XMLNode&);
~AudioDiskstream();
float playback_buffer_load() const;
float capture_buffer_load() const;
string input_source (uint32_t n=0) const {
std::string input_source (uint32_t n=0) const {
boost::shared_ptr<ChannelList> c = channels.reader();
if (n < c->size()) {
return (*c)[n]->source ? (*c)[n]->source->name() : "";
@ -280,7 +280,7 @@ class AudioDiskstream : public Diskstream
int use_new_write_source (uint32_t n=0);
int find_and_use_playlist (const string&);
int find_and_use_playlist (const std::string &);
void allocate_temporary_buffers ();

12
libs/ardour/ardour/audio_library.h
View file

@ -24,10 +24,6 @@
#include <map>
#include <vector>
using std::vector;
using std::string;
using std::map;
namespace ARDOUR {
class AudioLibrary
@ -36,15 +32,15 @@ class AudioLibrary
AudioLibrary ();
~AudioLibrary ();
void set_tags (string member, vector<string> tags);
vector<string> get_tags (string member);
void set_tags (std::string member, std::vector<std::string> tags);
std::vector<std::string> get_tags (std::string member);
void search_members_and (vector<string>& results, const vector<string> tags);
void search_members_and (std::vector<std::string>& results, const std::vector<std::string> tags);
void save_changes();
private:
string src;
std::string src;
};
extern AudioLibrary* Library;

6
libs/ardour/ardour/audio_playlist_importer.h
View file

@ -48,7 +48,7 @@ class AudioPlaylistImportHandler : public ElementImportHandler
AudioPlaylistImportHandler (XMLTree const & source, Session & session, AudioRegionImportHandler & region_handler, const char * nodename = "Playlists");
virtual ~AudioPlaylistImportHandler () {}
virtual string get_info () const;
virtual std::string get_info () const;
void get_regions (XMLNode const & node, ElementList & list) const;
void update_region_id (XMLProperty* id_prop);
@ -64,7 +64,7 @@ class UnusedAudioPlaylistImportHandler : public AudioPlaylistImportHandler
public:
UnusedAudioPlaylistImportHandler (XMLTree const & source, Session & session, AudioRegionImportHandler & region_handler) :
AudioPlaylistImportHandler (source, session, region_handler, X_("UnusedPlaylists")) { }
string get_info () const { return _("Audio Playlists (unused)"); }
std::string get_info () const { return _("Audio Playlists (unused)"); }
};
class AudioPlaylistImporter : public ElementImporter
@ -74,7 +74,7 @@ class AudioPlaylistImporter : public ElementImporter
AudioPlaylistImporter (AudioPlaylistImporter const & other);
~AudioPlaylistImporter ();
string get_info () const;
std::string get_info () const;
void set_diskstream (PBD::ID const & id);
PBD::ID const & orig_diskstream () const { return orig_diskstream_id; }

16
libs/ardour/ardour/audio_region_importer.h
View file

@ -43,14 +43,14 @@ class AudioRegionImportHandler : public ElementImportHandler
public:
// Inerface implementation
AudioRegionImportHandler (XMLTree const & source, Session & session);
string get_info () const;
std::string get_info () const;
void create_regions_from_children (XMLNode const & node, ElementList & list);
// Source management
bool check_source (string const & filename) const;
void add_source (string const & filename, boost::shared_ptr<Source> const & source);
boost::shared_ptr<Source> const & get_source (string const & filename) const;
bool check_source (std::string const & filename) const;
void add_source (std::string const & filename, boost::shared_ptr<Source> const & source);
boost::shared_ptr<Source> const & get_source (std::string const & filename) const;
// Id management
void register_id (PBD::ID & old_id, PBD::ID & new_id);
@ -58,8 +58,8 @@ class AudioRegionImportHandler : public ElementImportHandler
private:
// Source management
typedef std::map<string, boost::shared_ptr<Source> > SourceMap;
typedef std::pair<string, boost::shared_ptr<Source> > SourcePair;
typedef std::map<std::string, boost::shared_ptr<Source> > SourceMap;
typedef std::pair<std::string, boost::shared_ptr<Source> > SourcePair;
SourceMap sources;
// Id management
@ -75,7 +75,7 @@ class AudioRegionImporter : public ElementImporter
~AudioRegionImporter ();
// Interface implementation
string get_info () const;
std::string get_info () const;
Session::ImportStatus * get_import_status () { return &status; }
// other stuff
@ -93,7 +93,7 @@ class AudioRegionImporter : public ElementImporter
AudioRegionImportHandler & handler;
PBD::ID old_id;
PBD::ID id;
std::list<string> filenames;
std::list<std::string> filenames;
Session::ImportStatus status;
bool parse_xml_region ();

4
libs/ardour/ardour/audio_track.h
View file

@ -32,7 +32,7 @@ class RouteGroup;
class AudioTrack : public Track
{
public:
AudioTrack (Session&, string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal);
AudioTrack (Session&, std::string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal);
AudioTrack (Session&, const XMLNode&);
~AudioTrack ();
@ -44,7 +44,7 @@ class AudioTrack : public Track
boost::shared_ptr<AudioDiskstream> audio_diskstream() const;
int use_diskstream (string name);
int use_diskstream (std::string name);
int use_diskstream (const PBD::ID& id);
int export_stuff (BufferSet& bufs, nframes_t nframes, nframes_t end_frame, bool enable_processing = true);

4
libs/ardour/ardour/audio_track_importer.h
View file

@ -39,7 +39,7 @@ class AudioTrackImportHandler : public ElementImportHandler
public:
AudioTrackImportHandler (XMLTree const & source, Session & session, AudioPlaylistImportHandler & pl_handler);
virtual ~AudioTrackImportHandler () {}
virtual string get_info () const;
virtual std::string get_info () const;
private:
AudioPlaylistImportHandler & pl_handler;
@ -56,7 +56,7 @@ class AudioTrackImporter : public ElementImporter
AudioPlaylistImportHandler & pl_handler);
~AudioTrackImporter ();
string get_info () const;
std::string get_info () const;
protected:
bool _prepare_move ();

4
libs/ardour/ardour/audiofile_tagger.h
View file

@ -27,8 +27,6 @@
#include "taglib/taglib.h"
#include "taglib/xiphcomment.h"
using std::string;
namespace ARDOUR
{
@ -41,7 +39,7 @@ class AudiofileTagger
/* Tags file with metadata, return true on success */
static bool tag_file (string const & filename, SessionMetadata const & metadata);
static bool tag_file (std::string const & filename, SessionMetadata const & metadata);
private:

6
libs/ardour/ardour/audioplaylist.h
View file

@ -40,9 +40,9 @@ class AudioPlaylist : public ARDOUR::Playlist
public:
AudioPlaylist (Session&, const XMLNode&, bool hidden = false);
AudioPlaylist (Session&, string name, bool hidden = false);
AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, string name, bool hidden = false);
AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, nframes_t start, nframes_t cnt, string name, bool hidden = false);
AudioPlaylist (Session&, std::string name, bool hidden = false);
AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, std::string name, bool hidden = false);
AudioPlaylist (boost::shared_ptr<const AudioPlaylist>, nframes_t start, nframes_t cnt, std::string name, bool hidden = false);
~AudioPlaylist ();

12
libs/ardour/ardour/audioregion.h
View file

@ -36,8 +36,6 @@ class XMLNode;
namespace ARDOUR {
using std::vector;
class Route;
class Playlist;
class Session;
@ -136,7 +134,7 @@ class AudioRegion : public Region
void set_envelope_active (bool yn);
void set_default_envelope ();
int separate_by_channel (ARDOUR::Session&, vector<boost::shared_ptr<Region> >&) const;
int separate_by_channel (ARDOUR::Session&, std::vector<boost::shared_ptr<Region> >&) const;
/* automation */
@ -169,10 +167,10 @@ class AudioRegion : public Region
friend class Crossfade;
AudioRegion (boost::shared_ptr<AudioSource>, nframes_t start, nframes_t length);
AudioRegion (boost::shared_ptr<AudioSource>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
AudioRegion (const SourceList &, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
AudioRegion (boost::shared_ptr<const AudioRegion>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
AudioRegion (boost::shared_ptr<const AudioRegion>, const SourceList&, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
AudioRegion (boost::shared_ptr<AudioSource>, nframes_t start, nframes_t length, const std::string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
AudioRegion (const SourceList &, nframes_t start, nframes_t length, const std::string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
AudioRegion (boost::shared_ptr<const AudioRegion>, nframes_t start, nframes_t length, const std::string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
AudioRegion (boost::shared_ptr<const AudioRegion>, const SourceList&, nframes_t length, const std::string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
AudioRegion (boost::shared_ptr<const AudioRegion>);
AudioRegion (boost::shared_ptr<AudioSource>, const XMLNode&);
AudioRegion (SourceList &, const XMLNode&);

6
libs/ardour/ardour/audiosource.h
View file

@ -20,9 +20,6 @@
#ifndef __ardour_audio_source_h__
#define __ardour_audio_source_h__
#include <list>
#include <vector>
#include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp>
@ -38,9 +35,6 @@
#include "pbd/stateful.h"
#include "pbd/xml++.h"
using std::list;
using std::vector;
namespace ARDOUR {
class AudioSource : virtual public Source,

2
libs/ardour/ardour/automation_control.h
View file

@ -40,7 +40,7 @@ public:
AutomationControl(ARDOUR::Session&,
const Evoral::Parameter& parameter,
boost::shared_ptr<ARDOUR::AutomationList> l=boost::shared_ptr<ARDOUR::AutomationList>(),
const string& name="");
const std::string& name="");
boost::shared_ptr<AutomationList> alist() const {
return boost::dynamic_pointer_cast<AutomationList>(_list);

22
libs/ardour/ardour/broadcast_info.h
View file

@ -28,8 +28,6 @@
#include "ardour/types.h"
using std::string;
namespace ARDOUR
{
@ -44,7 +42,7 @@ class BroadcastInfo
~BroadcastInfo ();
/// Returns last error sring from libsndfile
string get_error () const { return error; }
std::string get_error () const { return error; }
/* Convenience functions */
@ -52,25 +50,25 @@ class BroadcastInfo
/* Reading */
bool load_from_file (string const & filename);
bool load_from_file (std::string const & filename);
bool load_from_file (SNDFILE* sf);
string get_description () const;
std::string get_description () const;
int64_t get_time_reference () const;
struct tm get_origination_time () const;
string get_originator () const;
string get_originator_ref () const;
std::string get_originator () const;
std::string get_originator_ref () const;
/* Writing */
bool write_to_file (string const & filename);
bool write_to_file (std::string const & filename);
bool write_to_file (SNDFILE* sf);
void set_description (string const & desc);
void set_description (std::string const & desc);
void set_time_reference (int64_t when);
void set_origination_time (struct tm * now = 0); // if 0, use time generated at construction
void set_originator (string const & str = "");
void set_originator_ref (string const & str = "");
void set_originator (std::string const & str = "");
void set_originator_ref (std::string const & str = "");
/* State info */
@ -83,7 +81,7 @@ class BroadcastInfo
struct tm _time;
void update_error ();
string error;
std::string error;
bool _has_info;
};

2
libs/ardour/ardour/click.h
View file

@ -27,7 +27,7 @@ namespace ARDOUR {
class ClickIO : public IO
{
public:
ClickIO (Session& s, const string& name) : IO (s, name) {}
ClickIO (Session& s, const std::string& name) : IO (s, name) {}
~ClickIO() {}
protected:

4
libs/ardour/ardour/configuration_vars.h
View file

@ -181,8 +181,8 @@ CONFIG_VARIABLE (DenormalModel, denormal_model, "denormal-model", DenormalNone)
/* BWAV */
CONFIG_VARIABLE (string, bwf_country_code, "bwf-country-code", "US")
CONFIG_VARIABLE (string, bwf_organization_code, "bwf-organization-code", "US")
CONFIG_VARIABLE (std::string, bwf_country_code, "bwf-country-code", "US")
CONFIG_VARIABLE (std::string, bwf_organization_code, "bwf-organization-code", "US")
/* these variables have custom set() methods (e.g. path globbing) */

4
libs/ardour/ardour/control_protocol_search_path.h
View file

@ -24,8 +24,6 @@
namespace ARDOUR {
using PBD::SearchPath;
/**
* return a SearchPath containing directories in which to look for
* control surface plugins.
@ -35,7 +33,7 @@ namespace ARDOUR {
* contain the user and system directories which may contain control
* surface plugins.
*/
SearchPath control_protocol_search_path ();
PBD::SearchPath control_protocol_search_path ();
} // namespace ARDOUR

2
libs/ardour/ardour/cycle_timer.h
View file

@ -41,7 +41,7 @@ class CycleTimer {
}
~CycleTimer() {
_exit = get_cycles();
std::cerr << _name << ": " << (float) (_exit - _entry) / cycles_per_usec << " (" << _entry << ", " << _exit << ')' << endl;
std::cerr << _name << ": " << (float) (_exit - _entry) / cycles_per_usec << " (" << _entry << ", " << _exit << ')' << std::endl;
}
static float get_mhz ();

10
libs/ardour/ardour/diskstream.h
View file

@ -68,11 +68,11 @@ class Diskstream : public SessionObject, public boost::noncopyable
NonLayered = 0x8
};
Diskstream (Session &, const string& name, Flag f = Recordable);
Diskstream (Session &, const std::string& name, Flag f = Recordable);
Diskstream (Session &, const XMLNode&);
virtual ~Diskstream();
bool set_name (const string& str);
bool set_name (const std::string& str);
ARDOUR::IO* io() const { return _io; }
void set_io (ARDOUR::IO& io);
@ -149,7 +149,7 @@ class Diskstream : public SessionObject, public boost::noncopyable
void remove_region_from_last_capture (boost::weak_ptr<Region> wregion);
void move_processor_automation (boost::weak_ptr<Processor>,
list< Evoral::RangeMove<nframes_t> > const &);
std::list< Evoral::RangeMove<nframes_t> > const &);
sigc::signal<void> RecordEnableChanged;
sigc::signal<void> SpeedChanged;
@ -215,7 +215,7 @@ class Diskstream : public SessionObject, public boost::noncopyable
virtual void playlist_changed (Change);
virtual void playlist_deleted (boost::weak_ptr<Playlist>);
virtual void playlist_ranges_moved (list< Evoral::RangeMove<nframes_t> > const &);
virtual void playlist_ranges_moved (std::list< Evoral::RangeMove<nframes_t> > const &);
virtual void transport_stopped (struct tm&, time_t, bool abort) = 0;
virtual void transport_looped (nframes_t transport_frame) = 0;
@ -229,7 +229,7 @@ class Diskstream : public SessionObject, public boost::noncopyable
virtual int use_new_write_source (uint32_t n=0) = 0;
virtual int find_and_use_playlist (const string&) = 0;
virtual int find_and_use_playlist (const std::string&) = 0;
virtual void allocate_temporary_buffers () = 0;

11
libs/ardour/ardour/element_import_handler.h
View file

@ -27,7 +27,6 @@
#include <boost/shared_ptr.hpp>
using std::string;
class XMLTree;
namespace ARDOUR {
@ -57,7 +56,7 @@ class ElementImportHandler
/** Gets a textual representation of the element type
* @return textual representation of element type
*/
virtual string get_info () const = 0;
virtual std::string get_info () const = 0;
/// Elements this handler handles
ElementList elements;
@ -68,13 +67,13 @@ class ElementImportHandler
* @param name name to check
* @return true if name is not used
*/
bool check_name (const string & name) const;
bool check_name (const std::string & name) const;
/// Adds name to the list of used names
void add_name (string name);
void add_name (std::string name);
/// Removes name from the list of used names
void remove_name (const string & name);
void remove_name (const std::string & name);
/// Checks wheter or not all elements can be imported cleanly
static bool dirty () { return _dirty; }
@ -103,7 +102,7 @@ class ElementImportHandler
private:
/// Set of names for duplicate checking
std::set<string> names;
std::set<std::string> names;
};
} // namespace ARDOUR

16
libs/ardour/ardour/element_importer.h
View file

@ -29,8 +29,6 @@
#include "ardour/types.h"
#include "ardour/session.h"
using std::string;
class XMLTree;
namespace ARDOUR {
@ -45,12 +43,12 @@ class ElementImporter
/** Returns the element name
* @return the name of the element
*/
virtual string get_name () const { return name; };
virtual std::string get_name () const { return name; };
/** Gets a textual representation of the element
* @return a textual representation on this specific element
*/
virtual string get_info () const = 0;
virtual std::string get_info () const = 0;
/** Gets import status, if applicable. */
virtual Session::ImportStatus * get_import_status () { return 0; }
@ -73,10 +71,10 @@ class ElementImporter
bool broken () { return _broken; }
/// Signal that requests for anew name
static sigc::signal <std::pair<bool, string>, string, string> Rename;
static sigc::signal <std::pair<bool, std::string>, std::string, std::string> Rename;
/// Signal for ok/cancel prompting
static sigc::signal <bool, string> Prompt;
static sigc::signal <bool, std::string> Prompt;
protected:
@ -107,19 +105,19 @@ class ElementImporter
bool queued () { return _queued; }
/// Name of element
string name;
std::string name;
/// The sample rate of the session from which we are importing
nframes_t sample_rate;
/// Converts smpte time to a string
string smpte_to_string(SMPTE::Time & time) const;
std::string smpte_to_string (SMPTE::Time & time) const;
/// Converts samples so that times match the sessions sample rate
nframes_t rate_convert_samples (nframes_t samples) const;
/// Converts samples so that times match the sessions sample rate (for straight use in XML)
string rate_convert_samples (string const & samples) const;
std::string rate_convert_samples (std::string const & samples) const;
/// Set element broken
void set_broken () { _broken = true; }

12
libs/ardour/ardour/export.h
View file

@ -32,17 +32,12 @@
#include "ardour/ardour.h"
#include "ardour/gdither.h"
using std::map;
using std::vector;
using std::string;
using std::pair;
namespace ARDOUR
{
class Port;
typedef pair<Port *, uint32_t> PortChannelPair;
typedef map<uint32_t, vector<PortChannelPair> > ExportPortMap;
typedef std::pair<Port *, uint32_t> PortChannelPair;
typedef std::map<uint32_t, std::vector<PortChannelPair> > ExportPortMap;
struct ExportSpecification : public SF_INFO, public sigc::trackable {
@ -52,14 +47,13 @@ namespace ARDOUR
void init ();
void clear ();
int prepare (nframes_t blocksize, nframes_t frame_rate);
int process (nframes_t nframes);
/* set by the user */
string path;
std::string path;
nframes_t sample_rate;
int src_quality;

8
libs/ardour/ardour/export_channel_configuration.h
View file

@ -32,8 +32,6 @@
#include "pbd/xml++.h"
using Glib::ustring;
namespace ARDOUR
{
@ -84,8 +82,8 @@ class ExportChannelConfiguration
ChannelList const & get_channels () const { return channels; }
bool all_channels_have_ports () const;
ustring name () const { return _name; }
void set_name (ustring name) { _name = name; }
Glib::ustring name () const { return _name; }
void set_name (Glib::ustring name) { _name = name; }
void set_split (bool value) { split = value; }
bool get_split () const { return split; }
@ -127,7 +125,7 @@ class ExportChannelConfiguration
FileConfigList file_configs;
bool split; // Split to mono files
ustring _name;
Glib::ustring _name;
};
} // namespace ARDOUR

4
libs/ardour/ardour/export_failed.h
View file

@ -27,8 +27,6 @@
#include "i18n.h"
using namespace PBD;
namespace ARDOUR
{
@ -38,7 +36,7 @@ class ExportFailed : public std::exception
ExportFailed (std::string const & reason) :
reason (reason.c_str())
{
error << string_compose (_("Export failed: %1"), reason) << endmsg;
PBD::error << string_compose (_("Export failed: %1"), reason) << endmsg;
}
~ExportFailed () throw() { }

16
libs/ardour/ardour/export_file_io.h
View file

@ -34,8 +34,6 @@
#include "ardour/export_format_specification.h"
#include "ardour/export_utilities.h"
using Glib::ustring;
namespace ARDOUR
{
@ -45,15 +43,15 @@ class ExportFileWriter
public:
virtual ~ExportFileWriter () {}
string filename () const { return _filename; }
std::string filename () const { return _filename; }
nframes_t position () const { return _position; }
void set_position (nframes_t position) { _position = position; }
protected:
ExportFileWriter (string filename) : _filename (filename) {}
ExportFileWriter (std::string filename) : _filename (filename) {}
string _filename;
std::string _filename;
nframes_t _position;
};
@ -65,7 +63,7 @@ class SndfileWriterBase : public ExportFileWriter
SNDFILE * get_sndfile () const { return sndfile; }
protected:
SndfileWriterBase (int channels, nframes_t samplerate, int format, string const & path);
SndfileWriterBase (int channels, nframes_t samplerate, int format, std::string const & path);
virtual ~SndfileWriterBase ();
SF_INFO sf_info;
@ -81,7 +79,7 @@ class SndfileWriter : public SndfileWriterBase, public GraphSink<T>
// Should only be created vie ExportFileFactory and derived classes
public: // protected
friend class ExportFileFactory;
SndfileWriter (int channels, nframes_t samplerate, int format, string const & path);
SndfileWriter (int channels, nframes_t samplerate, int format, std::string const & path);
public:
nframes_t write (T * data, nframes_t frames);
@ -165,12 +163,12 @@ class ExportFileFactory
typedef std::pair<FloatSinkPtr, FileWriterPtr> FilePair;
static FilePair create (FormatPtr format, uint32_t channels, ustring const & filename);
static FilePair create (FormatPtr format, uint32_t channels, Glib::ustring const & filename);
static bool check (FormatPtr format, uint32_t channels);
private:
static FilePair create_sndfile (FormatPtr format, unsigned int channels, ustring const & filename);
static FilePair create_sndfile (FormatPtr format, unsigned int channels, Glib::ustring const & filename);
static bool check_sndfile (FormatPtr format, unsigned int channels);
};

29
libs/ardour/ardour/export_filename.h
View file

@ -25,8 +25,6 @@
#include <glibmm/ustring.h>
#include "pbd/statefuldestructible.h"
using Glib::ustring;
namespace ARDOUR
{
@ -70,25 +68,25 @@ class ExportFilename {
/* data access */
ustring get_path (FormatPtr format) const;
ustring get_folder () const { return folder; }
Glib::ustring get_path (FormatPtr format) const;
Glib::ustring get_folder () const { return folder; }
TimeFormat get_time_format () const { return time_format; }
DateFormat get_date_format () const { return date_format; }
ustring get_time_format_str (TimeFormat format) const;
ustring get_date_format_str (DateFormat format) const;
Glib::ustring get_time_format_str (TimeFormat format) const;
Glib::ustring get_date_format_str (DateFormat format) const;
ustring get_label () const { return label; }
Glib::ustring get_label () const { return label; }
uint32_t get_revision () const { return revision; }
/* data modification */
void set_time_format (TimeFormat format);
void set_date_format (DateFormat format);
void set_label (ustring value);
void set_label (Glib::ustring value);
void set_revision (uint32_t value) { revision = value; }
void set_channel (uint32_t value) { channel = value; }
bool set_folder (ustring path);
bool set_folder (Glib::ustring path);
void set_timespan (TimespanPtr ts) { timespan = ts; }
void set_channel_config (ChannelConfigPtr cc) { channel_config = cc; }
@ -108,16 +106,16 @@ class ExportFilename {
Session & session;
ustring label;
Glib::ustring label;
uint32_t revision;
uint32_t channel;
ustring folder;
Glib::ustring folder;
DateFormat date_format;
TimeFormat time_format;
ustring get_formatted_time (ustring const & format) const;
Glib::ustring get_formatted_time (Glib::ustring const & format) const;
struct tm * time_struct; // Due to static allocation no destructor or copy-ctor is needed because of this
TimespanPtr timespan;
@ -125,12 +123,11 @@ class ExportFilename {
/* Serialization helpers */
typedef std::pair<bool, ustring> FieldPair;
typedef std::pair<bool, Glib::ustring> FieldPair;
void add_field (XMLNode * node, ustring const & name, bool enabled, ustring const & value = "");
FieldPair get_field (XMLNode const & node, ustring const & name);
void add_field (XMLNode * node, Glib::ustring const & name, bool enabled, Glib::ustring const & value = "");
FieldPair get_field (XMLNode const & node, Glib::ustring const & name);
FieldPair analyse_folder ();
};

3
libs/ardour/ardour/export_format_base.h
View file

@ -22,7 +22,6 @@
#define __ardour_export_format_base_h__
#include <set>
#include <string>
#include <algorithm>
#include <boost/shared_ptr.hpp>
#include <glibmm/ustring.h>
@ -32,8 +31,6 @@
#include "ardour/gdither_types.h"
#include "ardour/ardour.h"
using std::string;
namespace ARDOUR
{

2
libs/ardour/ardour/export_format_manager.h
View file

@ -31,8 +31,6 @@
#include "ardour/export_formats.h"
using std::string;
namespace ARDOUR
{

2
libs/ardour/ardour/export_format_specification.h
View file

@ -28,8 +28,6 @@
#include "ardour/types.h"
#include "ardour/export_format_base.h"
using std::string;
class XMLNode;
namespace ARDOUR

2
libs/ardour/ardour/export_formats.h
View file

@ -132,7 +132,7 @@ class HasSampleFormat {
sigc::signal<void, bool, WeakDitherTypePtr> DitherTypeSelectChanged;
sigc::signal<void, bool, WeakDitherTypePtr> DitherTypeCompatibleChanged;
static string get_sample_format_name (ExportFormatBase::SampleFormat format);
static std::string get_sample_format_name (ExportFormatBase::SampleFormat format);
protected:
/* State lists */

4
libs/ardour/ardour/export_handler.h
View file

@ -124,7 +124,7 @@ class ExportHandler : public ExportElementFactory, public sigc::trackable
/* CD Marker stuff */
struct CDMarkerStatus {
CDMarkerStatus (string out_file, TimespanPtr timespan, FormatPtr format, string filename) :
CDMarkerStatus (std::string out_file, TimespanPtr timespan, FormatPtr format, std::string filename) :
out (out_file.c_str()), timespan (timespan), format (format), filename (filename),
track_number (1), track_position (0), track_duration (0), track_start_frame (0),
index_number (1), index_position (0)
@ -134,7 +134,7 @@ class ExportHandler : public ExportElementFactory, public sigc::trackable
std::ofstream out;
TimespanPtr timespan;
FormatPtr format;
string filename;
std::string filename;
Location * marker;
/* Track info */

12
libs/ardour/ardour/export_preset.h
View file

@ -26,8 +26,6 @@
#include "pbd/uuid.h"
#include "pbd/xml++.h"
using std::string;
namespace ARDOUR
{
@ -35,13 +33,13 @@ class Session;
class ExportPreset {
public:
ExportPreset (string filename, Session & s);
ExportPreset (std::string filename, Session & s);
~ExportPreset ();
PBD::UUID const & id () const { return _id; }
string name () const { return _name; }
std::string name () const { return _name; }
void set_name (string const & name);
void set_name (std::string const & name);
// Note: The set_..._state functions take ownership of the XMLNode
void set_global_state (XMLNode & state);
@ -55,14 +53,14 @@ class ExportPreset {
private:
void set_id (string const & id);
void set_id (std::string const & id);
XMLNode * get_instant_xml () const;
void save_instant_xml () const;
void remove_instant_xml () const;
PBD::UUID _id;
string _name;
std::string _name;
Session & session;
XMLTree global;

3
libs/ardour/ardour/export_processor.h
View file

@ -30,9 +30,6 @@
#include "ardour/export_file_io.h"
#include "ardour/export_utilities.h"
using Glib::ustring;
using std::list;
namespace ARDOUR
{

7
libs/ardour/ardour/export_profile_manager.h
View file

@ -24,7 +24,6 @@
#include <list>
#include <vector>
#include <map>
#include <set>
#include <stdexcept>
#include <boost/shared_ptr.hpp>
@ -40,10 +39,6 @@
#include "ardour/location.h"
#include "ardour/types.h"
using std::string;
using std::list;
using std::set;
namespace ARDOUR
{
@ -72,7 +67,7 @@ class ExportProfileManager
PresetList const & get_presets () { return preset_list; }
bool load_preset (PresetPtr preset);
PresetPtr save_preset (string const & name);
PresetPtr save_preset (std::string const & name);
void remove_preset ();
private:

Some files were not shown because too many files have changed in this diff Show more