smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

remove Glib::ustring from gtk2_ardour

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-09-14 16:51:02 +00:00
parent c1ee2c6943
commit da8eec7a83
72 changed files with 303 additions and 308 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/add_route_dialog.cc
View file

@ -243,7 +243,7 @@ AddRouteDialog::mode ()
return ARDOUR::Normal; return ARDOUR::Normal;
} }
Glib::ustring str = mode_combo.get_active_text(); std::string str = mode_combo.get_active_text();
if (str == _("Normal")) { if (str == _("Normal")) {
return ARDOUR::Normal; return ARDOUR::Normal;
} else if (str == _("Non Layered")){ } else if (str == _("Non Layered")){

34
gtk2_ardour/ardour_ui.cc
View file

@ -1228,8 +1228,8 @@ ARDOUR_UI::open_recent_session ()
return; return;
} }
Glib::ustring path = (*i)[recent_session_columns.fullpath]; std::string path = (*i)[recent_session_columns.fullpath];
Glib::ustring state = (*i)[recent_session_columns.visible_name]; std::string state = (*i)[recent_session_columns.visible_name];
_session_is_new = false; _session_is_new = false;
@ -2248,7 +2248,7 @@ ARDOUR_UI::fontconfig_dialog ()
may not and it can take a while to build it. Warn them. may not and it can take a while to build it. Warn them.
*/ */
Glib::ustring fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig"); std::string fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig");
if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) { if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
MessageDialog msg (*_startup, MessageDialog msg (*_startup,
@ -2269,7 +2269,7 @@ ARDOUR_UI::fontconfig_dialog ()
} }
void void
ARDOUR_UI::parse_cmdline_path (const Glib::ustring& cmdline_path, Glib::ustring& session_name, Glib::ustring& session_path, bool& existing_session) ARDOUR_UI::parse_cmdline_path (const std::string& cmdline_path, std::string& session_name, std::string& session_path, bool& existing_session)
{ {
existing_session = false; existing_session = false;
@ -2288,7 +2288,7 @@ ARDOUR_UI::parse_cmdline_path (const Glib::ustring& cmdline_path, Glib::ustring&
} }
int int
ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::ustring& session_path, bool& existing_session) ARDOUR_UI::load_cmdline_session (const std::string& session_name, const std::string& session_path, bool& existing_session)
{ {
/* when this is called, the backend audio system must be running */ /* when this is called, the backend audio system must be running */
@ -2304,7 +2304,7 @@ ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::
if (Glib::file_test (session_path, Glib::FILE_TEST_IS_DIR)) { if (Glib::file_test (session_path, Glib::FILE_TEST_IS_DIR)) {
Glib::ustring predicted_session_file; std::string predicted_session_file;
predicted_session_file = session_path; predicted_session_file = session_path;
predicted_session_file += '/'; predicted_session_file += '/';
@ -2337,9 +2337,9 @@ ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::
} }
bool bool
ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path) ARDOUR_UI::ask_about_loading_existing_session (const std::string& session_path)
{ {
Glib::ustring str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path); std::string str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path);
MessageDialog msg (str, MessageDialog msg (str,
false, false,
@ -2363,7 +2363,7 @@ ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path
} }
int int
ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib::ustring& session_name) ARDOUR_UI::build_session_from_nsd (const std::string& session_path, const std::string& session_name)
{ {
BusProfile bus_profile; BusProfile bus_profile;
@ -2415,7 +2415,7 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
} }
void void
ARDOUR_UI::idle_load (const Glib::ustring& path) ARDOUR_UI::idle_load (const std::string& path)
{ {
if (_session) { if (_session) {
if (Glib::file_test (path, Glib::FILE_TEST_IS_DIR)) { if (Glib::file_test (path, Glib::FILE_TEST_IS_DIR)) {
@ -2565,7 +2565,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
if (likely_new) { if (likely_new) {
Glib::ustring existing = Glib::build_filename (session_path, session_name); std::string existing = Glib::build_filename (session_path, session_name);
if (!ask_about_loading_existing_session (existing)) { if (!ask_about_loading_existing_session (existing)) {
ARDOUR_COMMAND_LINE::session_name = ""; // cancel that ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
@ -2584,7 +2584,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
continue; continue;
} }
if (session_name.find ('/') != Glib::ustring::npos) { if (session_name.find ('/') != std::string::npos) {
MessageDialog msg (*_startup, _("To ensure compatibility with various systems\n" MessageDialog msg (*_startup, _("To ensure compatibility with various systems\n"
"session names may not contain a '/' character")); "session names may not contain a '/' character"));
msg.run (); msg.run ();
@ -2592,7 +2592,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
continue; continue;
} }
if (session_name.find ('\\') != Glib::ustring::npos) { if (session_name.find ('\\') != std::string::npos) {
MessageDialog msg (*_startup, _("To ensure compatibility with various systems\n" MessageDialog msg (*_startup, _("To ensure compatibility with various systems\n"
"session names may not contain a '\\' character")); "session names may not contain a '\\' character"));
msg.run (); msg.run ();
@ -2641,7 +2641,7 @@ ARDOUR_UI::close_session()
} }
int int
ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_name, Glib::ustring mix_template) ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name, std::string mix_template)
{ {
Session *new_session; Session *new_session;
int unload_status; int unload_status;
@ -2749,7 +2749,7 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
} }
int int
ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_name, BusProfile& bus_profile) ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name, BusProfile& bus_profile)
{ {
Session *new_session; Session *new_session;
int x; int x;
@ -2900,8 +2900,8 @@ require some unused files to continue to exist."));
add (visible_name); add (visible_name);
add (fullpath); add (fullpath);
} }
Gtk::TreeModelColumn<Glib::ustring> visible_name; Gtk::TreeModelColumn<std::string> visible_name;
Gtk::TreeModelColumn<Glib::ustring> fullpath; Gtk::TreeModelColumn<std::string> fullpath;
}; };

18
gtk2_ardour/ardour_ui.h
View file

@ -122,12 +122,12 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void show_about (); void show_about ();
void hide_about (); void hide_about ();
void idle_load (const Glib::ustring& path); void idle_load (const std::string& path);
void finish(); void finish();
int load_session (const Glib::ustring& path, const Glib::ustring& snapshot, Glib::ustring mix_template = Glib::ustring()); int load_session (const std::string& path, const std::string& snapshot, std::string mix_template = std::string());
bool session_loaded; bool session_loaded;
int build_session (const Glib::ustring& path, const Glib::ustring& snapshot, ARDOUR::BusProfile&); int build_session (const std::string& path, const std::string& snapshot, ARDOUR::BusProfile&);
bool session_is_new() const { return _session_is_new; } bool session_is_new() const { return _session_is_new; }
ARDOUR::Session* the_session() { return _session; } ARDOUR::Session* the_session() { return _session; }
@ -141,10 +141,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
} }
int get_session_parameters (bool quit_on_cancel, bool should_be_new = false, std::string load_template = ""); int get_session_parameters (bool quit_on_cancel, bool should_be_new = false, std::string load_template = "");
void parse_cmdline_path (const Glib::ustring& cmdline_path, Glib::ustring& session_name, Glib::ustring& session_path, bool& existing_session); void parse_cmdline_path (const std::string& cmdline_path, std::string& session_name, std::string& session_path, bool& existing_session);
int load_cmdline_session (const Glib::ustring& session_name, const Glib::ustring& session_path, bool& existing_session); int load_cmdline_session (const std::string& session_name, const std::string& session_path, bool& existing_session);
int build_session_from_nsd (const Glib::ustring& session_name, const Glib::ustring& session_path); int build_session_from_nsd (const std::string& session_name, const std::string& session_path);
bool ask_about_loading_existing_session (const Glib::ustring& session_path); bool ask_about_loading_existing_session (const std::string& session_path);
/// @return true if session was successfully unloaded. /// @return true if session was successfully unloaded.
int unload_session (bool hide_stuff = false); int unload_session (bool hide_stuff = false);
@ -479,8 +479,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
add (visible_name); add (visible_name);
add (fullpath); add (fullpath);
} }
Gtk::TreeModelColumn<Glib::ustring> visible_name; Gtk::TreeModelColumn<std::string> visible_name;
Gtk::TreeModelColumn<Glib::ustring> fullpath; Gtk::TreeModelColumn<std::string> fullpath;
}; };
RecentSessionModelColumns recent_session_columns; RecentSessionModelColumns recent_session_columns;

4
gtk2_ardour/ardour_ui2.cc
View file

@ -165,7 +165,7 @@ ARDOUR_UI::status_bar_button_press (GdkEventButton* ev)
void void
ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr<TextBuffer::Tag> ptag, RefPtr<TextBuffer::Tag> mtag, const char *msg) ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr<TextBuffer::Tag> ptag, RefPtr<TextBuffer::Tag> mtag, const char *msg)
{ {
ustring text; string text;
UI::display_message (prefix, prefix_len, ptag, mtag, msg); UI::display_message (prefix, prefix_len, ptag, mtag, msg);
#ifdef TOP_MENUBAR #ifdef TOP_MENUBAR
@ -880,7 +880,7 @@ ARDOUR_UI::shuttle_unit_clicked ()
void void
ARDOUR_UI::shuttle_style_changed () ARDOUR_UI::shuttle_style_changed ()
{ {
ustring str = shuttle_style_button.get_active_text (); string str = shuttle_style_button.get_active_text ();
if (str == _("sprung")) { if (str == _("sprung")) {
Config->set_shuttle_behaviour (Sprung); Config->set_shuttle_behaviour (Sprung);

2
gtk2_ardour/audio_region_view.cc
View file

@ -369,7 +369,7 @@ AudioRegionView::region_scale_amplitude_changed ()
void void
AudioRegionView::region_renamed () AudioRegionView::region_renamed ()
{ {
Glib::ustring str = RegionView::make_name (); std::string str = RegionView::make_name ();
if (audio_region()->speed_mismatch (trackview.session()->frame_rate())) { if (audio_region()->speed_mismatch (trackview.session()->frame_rate())) {
str = string ("*") + str; str = string ("*") + str;

2
gtk2_ardour/bundle_manager.h
View file

@ -103,7 +103,7 @@ class BundleManager : public ArdourDialog
add (bundle); add (bundle);
} }
Gtk::TreeModelColumn<Glib::ustring> name; Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::UserBundle> > bundle; Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::UserBundle> > bundle;
}; };

2
gtk2_ardour/canvas-flag.cc
View file

@ -43,7 +43,7 @@ CanvasFlag::set_text(const string& a_text)
{ {
delete_allocated_objects(); delete_allocated_objects();
_text = new Text (*this, 0.0, 0.0, Glib::ustring(a_text)); _text = new Text (*this, 0.0, 0.0, std::string(a_text));
_text->property_justification() = Gtk::JUSTIFY_CENTER; _text->property_justification() = Gtk::JUSTIFY_CENTER;
_text->property_fill_color_rgba() = _outline_color_rgba; _text->property_fill_color_rgba() = _outline_color_rgba;
double flagwidth = _text->property_text_width() + 10.0; double flagwidth = _text->property_text_width() + 10.0;

2
gtk2_ardour/canvas-noevent-text.h
View file

@ -29,7 +29,7 @@ namespace Gnome { namespace Canvas {
class NoEventText : public Text class NoEventText : public Text
{ {
public: public:
NoEventText(Group& parent, double x, double y, const Glib::ustring& text) NoEventText(Group& parent, double x, double y, const std::string& text)
: Text (parent, x, y, text) {} : Text (parent, x, y, text) {}
NoEventText(Group& parent) NoEventText(Group& parent)
: Text (parent) {} : Text (parent) {}

6
gtk2_ardour/canvas-program-change.cc
View file

@ -65,7 +65,7 @@ CanvasProgramChange::initialize_popup_menus()
bank != patch_banks.end(); bank != patch_banks.end();
++bank) { ++bank) {
Glib::RefPtr<Glib::Regex> underscores = Glib::Regex::create("_"); Glib::RefPtr<Glib::Regex> underscores = Glib::Regex::create("_");
Glib::ustring replacement(" "); std::string replacement(" ");
Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu()); Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu());
@ -75,7 +75,7 @@ CanvasProgramChange::initialize_popup_menus()
for (PatchBank::PatchNameList::const_iterator patch = patches.begin(); for (PatchBank::PatchNameList::const_iterator patch = patches.begin();
patch != patches.end(); patch != patches.end();
++patch) { ++patch) {
Glib::ustring name = underscores->replace((*patch)->name().c_str(), -1, 0, replacement); std::string name = underscores->replace((*patch)->name().c_str(), -1, 0, replacement);
patch_menus.push_back( patch_menus.push_back(
Gtk::Menu_Helpers::MenuElem( Gtk::Menu_Helpers::MenuElem(
@ -86,7 +86,7 @@ CanvasProgramChange::initialize_popup_menus()
} }
Glib::ustring name = underscores->replace((*bank)->name().c_str(), -1, 0, replacement); std::string name = underscores->replace((*bank)->name().c_str(), -1, 0, replacement);
patch_bank_menus.push_back( patch_bank_menus.push_back(
Gtk::Menu_Helpers::MenuElem( Gtk::Menu_Helpers::MenuElem(

2
gtk2_ardour/configinfo.cc
View file

@ -26,7 +26,7 @@ ConfigInfoDialog::ConfigInfoDialog ()
: ArdourDialog (_("Build Configuration")) : ArdourDialog (_("Build Configuration"))
{ {
set_border_width (12); set_border_width (12);
text.get_buffer()->set_text (Glib::ustring (ARDOUR::ardour_config_info)); text.get_buffer()->set_text (std::string (ARDOUR::ardour_config_info));
text.set_wrap_mode (Gtk::WRAP_WORD); text.set_wrap_mode (Gtk::WRAP_WORD);
text.show (); text.show ();
text.set_size_request (300, 800); text.set_size_request (300, 800);

16
gtk2_ardour/editor.cc
View file

@ -3235,7 +3235,7 @@ Editor::convert_drop_to_paths (
return -1; return -1;
} }
vector<ustring> uris = data.get_uris(); vector<string> uris = data.get_uris();
if (uris.empty()) { if (uris.empty()) {
@ -3253,7 +3253,7 @@ Editor::convert_drop_to_paths (
THERE MAY BE NO NULL TERMINATING CHAR!!! THERE MAY BE NO NULL TERMINATING CHAR!!!
*/ */
ustring txt = data.get_text(); string txt = data.get_text();
const char* p; const char* p;
const char* q; const char* q;
@ -3281,7 +3281,7 @@ Editor::convert_drop_to_paths (
if (q > p) if (q > p)
{ {
uris.push_back (ustring (p, q - p + 1)); uris.push_back (string (p, q - p + 1));
} }
} }
} }
@ -3297,18 +3297,18 @@ Editor::convert_drop_to_paths (
} }
} }
for (vector<ustring>::iterator i = uris.begin(); i != uris.end(); ++i) { for (vector<string>::iterator i = uris.begin(); i != uris.end(); ++i) {
if ((*i).substr (0,7) == "file://") { if ((*i).substr (0,7) == "file://") {
ustring p = *i; string p = *i;
PBD::url_decode (p); PBD::url_decode (p);
// scan forward past three slashes // scan forward past three slashes
ustring::size_type slashcnt = 0; string::size_type slashcnt = 0;
ustring::size_type n = 0; string::size_type n = 0;
ustring::iterator x = p.begin(); string::iterator x = p.begin();
while (slashcnt < 3 && x != p.end()) { while (slashcnt < 3 && x != p.end()) {
if ((*x) == '/') { if ((*x) == '/') {

8
gtk2_ardour/editor_audio_import.cc
View file

@ -24,8 +24,6 @@
#include <unistd.h> #include <unistd.h>
#include <algorithm> #include <algorithm>
#include <glibmm/ustring.h>
#include <sndfile.h> #include <sndfile.h>
#include "pbd/pthread_utils.h" #include "pbd/pthread_utils.h"
@ -71,7 +69,7 @@ using namespace PBD;
using namespace Gtk; using namespace Gtk;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
using namespace Editing; using namespace Editing;
using Glib::ustring; using std::string;
/* Functions supporting the incorporation of external (non-captured) audio material into ardour */ /* Functions supporting the incorporation of external (non-captured) audio material into ardour */
@ -150,8 +148,8 @@ Editor::external_audio_dialog ()
/* lets do it */ /* lets do it */
vector<ustring> upaths = sfbrowser->get_paths (); vector<string> upaths = sfbrowser->get_paths ();
for (vector<ustring>::iterator x = upaths.begin(); x != upaths.end(); ++x) { for (vector<string>::iterator x = upaths.begin(); x != upaths.end(); ++x) {
paths.push_back (*x); paths.push_back (*x);
} }

2
gtk2_ardour/editor_ops.cc
View file

@ -5977,7 +5977,7 @@ Editor::split_region_at_points (boost::shared_ptr<Region> r, AnalysisFeatureList
if (positions.size() > 20) { if (positions.size() > 20) {
Glib::ustring msgstr = string_compose (_("You are about to split\n%1\ninto %2 pieces.\nThis could take a long time."), r->name(), positions.size() + 1); std::string msgstr = string_compose (_("You are about to split\n%1\ninto %2 pieces.\nThis could take a long time."), r->name(), positions.size() + 1);
MessageDialog msg (msgstr, MessageDialog msg (msgstr,
false, false,
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,

17
gtk2_ardour/editor_regions.cc
View file

@ -196,7 +196,8 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
boost::shared_ptr<Region> proxy = parent[_columns.region]; boost::shared_ptr<Region> proxy = parent[_columns.region];
proxy.reset (); proxy.reset ();
} else { } else {
if ((*iter)[_columns.name] != _("Hidden")) { string s = (*iter)[_columns.name];
if (s != _("Hidden")) {
parent = *(_model->insert(iter)); parent = *(_model->insert(iter));
parent[_columns.name] = _("Hidden"); parent[_columns.name] = _("Hidden");
boost::shared_ptr<Region> proxy = parent[_columns.region]; boost::shared_ptr<Region> proxy = parent[_columns.region];
@ -998,8 +999,8 @@ EditorRegions::sorter (TreeModel::iterator a, TreeModel::iterator b)
boost::shared_ptr<AudioRegion> region2 = boost::dynamic_pointer_cast<AudioRegion> (r2); boost::shared_ptr<AudioRegion> region2 = boost::dynamic_pointer_cast<AudioRegion> (r2);
if (region1 == 0 || region2 == 0) { if (region1 == 0 || region2 == 0) {
Glib::ustring s1; std::string s1;
Glib::ustring s2; std::string s2;
switch (_sort_type) { switch (_sort_type) {
case ByName: case ByName:
s1 = (*a)[_columns.name]; s1 = (*a)[_columns.name];
@ -1157,7 +1158,7 @@ EditorRegions::selection_filter (const RefPtr<TreeModel>& model, const TreeModel
} }
void void
EditorRegions::name_edit (const Glib::ustring& path, const Glib::ustring& new_text) EditorRegions::name_edit (const std::string& path, const std::string& new_text)
{ {
boost::shared_ptr<Region> region; boost::shared_ptr<Region> region;
TreeIter iter; TreeIter iter;
@ -1229,7 +1230,7 @@ EditorRegions::get_single_selection ()
} }
void void
EditorRegions::locked_changed (Glib::ustring const & path) EditorRegions::locked_changed (std::string const & path)
{ {
TreeIter i = _model->get_iter (path); TreeIter i = _model->get_iter (path);
if (i) { if (i) {
@ -1241,7 +1242,7 @@ EditorRegions::locked_changed (Glib::ustring const & path)
} }
void void
EditorRegions::glued_changed (Glib::ustring const & path) EditorRegions::glued_changed (std::string const & path)
{ {
TreeIter i = _model->get_iter (path); TreeIter i = _model->get_iter (path);
if (i) { if (i) {
@ -1255,7 +1256,7 @@ EditorRegions::glued_changed (Glib::ustring const & path)
} }
void void
EditorRegions::muted_changed (Glib::ustring const & path) EditorRegions::muted_changed (std::string const & path)
{ {
TreeIter i = _model->get_iter (path); TreeIter i = _model->get_iter (path);
if (i) { if (i) {
@ -1268,7 +1269,7 @@ EditorRegions::muted_changed (Glib::ustring const & path)
} }
void void
EditorRegions::opaque_changed (Glib::ustring const & path) EditorRegions::opaque_changed (std::string const & path)
{ {
TreeIter i = _model->get_iter (path); TreeIter i = _model->get_iter (path);
if (i) { if (i) {

28
gtk2_ardour/editor_regions.h
View file

@ -85,21 +85,21 @@ private:
add (property_toggles_visible); add (property_toggles_visible);
} }
Gtk::TreeModelColumn<Glib::ustring> name; Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Region> > region; Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Region> > region;
Gtk::TreeModelColumn<Gdk::Color> color_; Gtk::TreeModelColumn<Gdk::Color> color_;
Gtk::TreeModelColumn<Glib::ustring> start; Gtk::TreeModelColumn<std::string> start;
Gtk::TreeModelColumn<Glib::ustring> end; Gtk::TreeModelColumn<std::string> end;
Gtk::TreeModelColumn<Glib::ustring> length; Gtk::TreeModelColumn<std::string> length;
Gtk::TreeModelColumn<Glib::ustring> sync; Gtk::TreeModelColumn<std::string> sync;
Gtk::TreeModelColumn<Glib::ustring> fadein; Gtk::TreeModelColumn<std::string> fadein;
Gtk::TreeModelColumn<Glib::ustring> fadeout; Gtk::TreeModelColumn<std::string> fadeout;
Gtk::TreeModelColumn<bool> locked; Gtk::TreeModelColumn<bool> locked;
Gtk::TreeModelColumn<bool> glued; Gtk::TreeModelColumn<bool> glued;
Gtk::TreeModelColumn<bool> muted; Gtk::TreeModelColumn<bool> muted;
Gtk::TreeModelColumn<bool> opaque; Gtk::TreeModelColumn<bool> opaque;
Gtk::TreeModelColumn<Glib::ustring> used; Gtk::TreeModelColumn<std::string> used;
Gtk::TreeModelColumn<Glib::ustring> path; Gtk::TreeModelColumn<std::string> path;
/** used to indicate whether the locked/glued/muted/opaque should be visible or not */ /** used to indicate whether the locked/glued/muted/opaque should be visible or not */
Gtk::TreeModelColumn<bool> property_toggles_visible; Gtk::TreeModelColumn<bool> property_toggles_visible;
}; };
@ -111,11 +111,11 @@ private:
sigc::connection _change_connection; sigc::connection _change_connection;
bool set_selected_in_subrow (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &, int); bool set_selected_in_subrow (boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &, int);
bool selection_filter (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool yn); bool selection_filter (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool yn);
void name_edit (const Glib::ustring&, const Glib::ustring&); void name_edit (const std::string&, const std::string&);
void locked_changed (Glib::ustring const &); void locked_changed (std::string const &);
void glued_changed (Glib::ustring const &); void glued_changed (std::string const &);
void muted_changed (Glib::ustring const &); void muted_changed (std::string const &);
void opaque_changed (Glib::ustring const &); void opaque_changed (std::string const &);
bool key_press (GdkEventKey *); bool key_press (GdkEventKey *);
bool button_press (GdkEventButton *); bool button_press (GdkEventButton *);

2
gtk2_ardour/editor_route_groups.cc
View file

@ -456,7 +456,7 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange& ch
} }
void void
EditorRouteGroups::name_edit (const Glib::ustring& path, const Glib::ustring& new_text) EditorRouteGroups::name_edit (const std::string& path, const std::string& new_text)
{ {
RouteGroup* group; RouteGroup* group;
TreeIter iter; TreeIter iter;

2
gtk2_ardour/editor_route_groups.h
View file

@ -64,7 +64,7 @@ private:
void add (ARDOUR::RouteGroup *); void add (ARDOUR::RouteGroup *);
void row_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&); void row_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&);
void name_edit (const Glib::ustring&, const Glib::ustring&); void name_edit (const std::string&, const std::string&);
void button_clicked (); void button_clicked ();
gint button_press_event (GdkEventButton* ev); gint button_press_event (GdkEventButton* ev);
void groups_changed (); void groups_changed ();

14
gtk2_ardour/editor_routes.cc
View file

@ -217,7 +217,7 @@ EditorRoutes::set_session (Session* s)
} }
void void
EditorRoutes::on_tv_rec_enable_changed (Glib::ustring const & path_string) EditorRoutes::on_tv_rec_enable_changed (std::string const & path_string)
{ {
// Get the model row that has been toggled. // Get the model row that has been toggled.
Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string));
@ -233,7 +233,7 @@ EditorRoutes::on_tv_rec_enable_changed (Glib::ustring const & path_string)
} }
void void
EditorRoutes::on_tv_mute_enable_toggled (Glib::ustring const & path_string) EditorRoutes::on_tv_mute_enable_toggled (std::string const & path_string)
{ {
// Get the model row that has been toggled. // Get the model row that has been toggled.
Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string));
@ -249,7 +249,7 @@ EditorRoutes::on_tv_mute_enable_toggled (Glib::ustring const & path_string)
} }
void void
EditorRoutes::on_tv_solo_enable_toggled (Glib::ustring const & path_string) EditorRoutes::on_tv_solo_enable_toggled (std::string const & path_string)
{ {
// Get the model row that has been toggled. // Get the model row that has been toggled.
Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string));
@ -265,7 +265,7 @@ EditorRoutes::on_tv_solo_enable_toggled (Glib::ustring const & path_string)
} }
void void
EditorRoutes::on_tv_solo_isolate_toggled (Glib::ustring const & path_string) EditorRoutes::on_tv_solo_isolate_toggled (std::string const & path_string)
{ {
// Get the model row that has been toggled. // Get the model row that has been toggled.
Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string));
@ -279,7 +279,7 @@ EditorRoutes::on_tv_solo_isolate_toggled (Glib::ustring const & path_string)
} }
void void
EditorRoutes::on_tv_solo_safe_toggled (Glib::ustring const & path_string) EditorRoutes::on_tv_solo_safe_toggled (std::string const & path_string)
{ {
// Get the model row that has been toggled. // Get the model row that has been toggled.
Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string));
@ -404,7 +404,7 @@ EditorRoutes::route_deleted (Gtk::TreeModel::Path const &)
} }
void void
EditorRoutes::visible_changed (Glib::ustring const & path) EditorRoutes::visible_changed (std::string const & path)
{ {
if (_session && _session->deletion_in_progress()) { if (_session && _session->deletion_in_progress()) {
return; return;
@ -1138,7 +1138,7 @@ EditorRoutes::clear ()
} }
void void
EditorRoutes::name_edit (Glib::ustring const & path, Glib::ustring const & new_text) EditorRoutes::name_edit (std::string const & path, std::string const & new_text)
{ {
TreeIter iter = _model->get_iter (path); TreeIter iter = _model->get_iter (path);
if (!iter) { if (!iter) {

16
gtk2_ardour/editor_routes.h
View file

@ -59,15 +59,15 @@ public:
private: private:
void initial_display (); void initial_display ();
void on_tv_rec_enable_changed (Glib::ustring const &); void on_tv_rec_enable_changed (std::string const &);
void on_tv_mute_enable_toggled (Glib::ustring const &); void on_tv_mute_enable_toggled (std::string const &);
void on_tv_solo_enable_toggled (Glib::ustring const &); void on_tv_solo_enable_toggled (std::string const &);
void on_tv_solo_isolate_toggled (Glib::ustring const &); void on_tv_solo_isolate_toggled (std::string const &);
void on_tv_solo_safe_toggled (Glib::ustring const &); void on_tv_solo_safe_toggled (std::string const &);
void build_menu (); void build_menu ();
void show_menu (); void show_menu ();
void route_deleted (Gtk::TreeModel::Path const &); void route_deleted (Gtk::TreeModel::Path const &);
void visible_changed (Glib::ustring const &); void visible_changed (std::string const &);
void reordered (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const &, int *); void reordered (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const &, int *);
bool button_press (GdkEventButton *); bool button_press (GdkEventButton *);
void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr<ARDOUR::Route>); void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr<ARDOUR::Route>);
@ -95,7 +95,7 @@ private:
void track_list_reorder (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const & iter, int* new_order); void track_list_reorder (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const & iter, int* new_order);
bool selection_filter (Glib::RefPtr<Gtk::TreeModel> const &, Gtk::TreeModel::Path const &, bool); bool selection_filter (Glib::RefPtr<Gtk::TreeModel> const &, Gtk::TreeModel::Path const &, bool);
void name_edit (Glib::ustring const &, Glib::ustring const &); void name_edit (std::string const &, std::string const &);
void solo_changed_so_update_mute (); void solo_changed_so_update_mute ();
struct ModelColumns : public Gtk::TreeModel::ColumnRecord { struct ModelColumns : public Gtk::TreeModel::ColumnRecord {
@ -113,7 +113,7 @@ private:
add (name_editable); add (name_editable);
} }
Gtk::TreeModelColumn<Glib::ustring> text; Gtk::TreeModelColumn<std::string> text;
Gtk::TreeModelColumn<bool> visible; Gtk::TreeModelColumn<bool> visible;
Gtk::TreeModelColumn<uint32_t> rec_state; Gtk::TreeModelColumn<uint32_t> rec_state;
Gtk::TreeModelColumn<uint32_t> mute_state; Gtk::TreeModelColumn<uint32_t> mute_state;

8
gtk2_ardour/editor_snapshots.cc
View file

@ -68,7 +68,7 @@ EditorSnapshots::selection_changed ()
TreeModel::iterator i = _display.get_selection()->get_selected(); TreeModel::iterator i = _display.get_selection()->get_selected();
Glib::ustring snap_name = (*i)[_columns.real_name]; std::string snap_name = (*i)[_columns.real_name];
if (snap_name.length() == 0) { if (snap_name.length() == 0) {
return; return;
@ -111,7 +111,7 @@ EditorSnapshots::button_press (GdkEventButton* ev)
* @snapshot_name Name of the snapshot that the menu click was over. * @snapshot_name Name of the snapshot that the menu click was over.
*/ */
void void
EditorSnapshots::popup_context_menu (int button, int32_t time, Glib::ustring snapshot_name) EditorSnapshots::popup_context_menu (int button, int32_t time, std::string snapshot_name)
{ {
using namespace Menu_Helpers; using namespace Menu_Helpers;
@ -128,7 +128,7 @@ EditorSnapshots::popup_context_menu (int button, int32_t time, Glib::ustring sna
} }
void void
EditorSnapshots::rename (Glib::ustring old_name) EditorSnapshots::rename (std::string old_name)
{ {
ArdourPrompter prompter(true); ArdourPrompter prompter(true);
@ -150,7 +150,7 @@ EditorSnapshots::rename (Glib::ustring old_name)
void void
EditorSnapshots::remove (Glib::ustring name) EditorSnapshots::remove (std::string name)
{ {
vector<string> choices; vector<string> choices;

10
gtk2_ardour/editor_snapshots.h
View file

@ -45,8 +45,8 @@ private:
add (visible_name); add (visible_name);
add (real_name); add (real_name);
} }
Gtk::TreeModelColumn<Glib::ustring> visible_name; Gtk::TreeModelColumn<std::string> visible_name;
Gtk::TreeModelColumn<Glib::ustring> real_name; Gtk::TreeModelColumn<std::string> real_name;
}; };
Columns _columns; Columns _columns;
@ -56,7 +56,7 @@ private:
bool button_press (GdkEventButton *); bool button_press (GdkEventButton *);
void selection_changed (); void selection_changed ();
void popup_context_menu (int, int32_t, Glib::ustring); void popup_context_menu (int, int32_t, std::string);
void remove (Glib::ustring); void remove (std::string);
void rename (Glib::ustring); void rename (std::string);
}; };

6
gtk2_ardour/engine_dialog.cc
View file

@ -631,7 +631,7 @@ EngineControl::setup_engine ()
return 1; // try again return 1; // try again
} }
Glib::ustring jackdrc_path = Glib::get_home_dir(); std::string jackdrc_path = Glib::get_home_dir();
jackdrc_path += "/.jackdrc"; jackdrc_path += "/.jackdrc";
ofstream jackdrc (jackdrc_path.c_str()); ofstream jackdrc (jackdrc_path.c_str());
@ -954,7 +954,7 @@ EngineControl::redisplay_latency ()
void void
EngineControl::audio_mode_changed () EngineControl::audio_mode_changed ()
{ {
Glib::ustring str = audio_mode_combo.get_active_text(); std::string str = audio_mode_combo.get_active_text();
if (str == _("Playback/Recording on 1 Device")) { if (str == _("Playback/Recording on 1 Device")) {
input_device_combo.set_sensitive (false); input_device_combo.set_sensitive (false);
@ -1091,7 +1091,7 @@ EngineControl::get_state ()
{ {
XMLNode* root = new XMLNode ("AudioSetup"); XMLNode* root = new XMLNode ("AudioSetup");
XMLNode* child; XMLNode* child;
Glib::ustring path; std::string path;
child = new XMLNode ("periods"); child = new XMLNode ("periods");
child->add_property ("val", to_string (periods_adjustment.get_value(), std::dec)); child->add_property ("val", to_string (periods_adjustment.get_value(), std::dec));

24
gtk2_ardour/export_channel_selector.cc
View file

@ -219,11 +219,11 @@ PortExportChannelSelector::ChannelTreeView::set_config (ChannelConfigPtr c)
Glib::RefPtr<Gtk::ListStore> port_list = r_it->get_value (route_cols.port_list_col); Glib::RefPtr<Gtk::ListStore> port_list = r_it->get_value (route_cols.port_list_col);
std::set<AudioPort *> route_ports; std::set<AudioPort *> route_ports;
std::set<AudioPort *> intersection; std::set<AudioPort *> intersection;
std::map<AudioPort *, ustring> port_labels; std::map<AudioPort *, string> port_labels;
for (Gtk::ListStore::Children::const_iterator p_it = port_list->children().begin(); p_it != port_list->children().end(); ++p_it) { for (Gtk::ListStore::Children::const_iterator p_it = port_list->children().begin(); p_it != port_list->children().end(); ++p_it) {
route_ports.insert ((*p_it)->get_value (route_cols.port_cols.port)); route_ports.insert ((*p_it)->get_value (route_cols.port_cols.port));
port_labels.insert (std::pair<AudioPort*, ustring> ((*p_it)->get_value (route_cols.port_cols.port), port_labels.insert (std::pair<AudioPort*, string> ((*p_it)->get_value (route_cols.port_cols.port),
(*p_it)->get_value (route_cols.port_cols.label))); (*p_it)->get_value (route_cols.port_cols.label)));
} }
@ -244,13 +244,13 @@ PortExportChannelSelector::ChannelTreeView::set_config (ChannelConfigPtr c)
for (uint32_t chn = 1; chn < i; ++chn) { for (uint32_t chn = 1; chn < i; ++chn) {
r_it->set_value (route_cols.get_channel (chn).port, (AudioPort *) 0); r_it->set_value (route_cols.get_channel (chn).port, (AudioPort *) 0);
r_it->set_value (route_cols.get_channel (chn).label, ustring ("(none)")); r_it->set_value (route_cols.get_channel (chn).label, string ("(none)"));
} }
} }
AudioPort * port = *intersection.begin(); AudioPort * port = *intersection.begin();
std::map<AudioPort *, ustring>::iterator label_it = port_labels.find (port); std::map<AudioPort *, string>::iterator label_it = port_labels.find (port);
ustring label = label_it != port_labels.end() ? label_it->second : "error"; string label = label_it != port_labels.end() ? label_it->second : "error";
r_it->set_value (route_cols.get_channel (i).port, port); r_it->set_value (route_cols.get_channel (i).port, port);
r_it->set_value (route_cols.get_channel (i).label, label); r_it->set_value (route_cols.get_channel (i).label, label);
@ -328,7 +328,7 @@ PortExportChannelSelector::ChannelTreeView::set_channel_count (uint32_t channels
/* put data into view */ /* put data into view */
for (Gtk::ListStore::Children::iterator it = route_list->children().begin(); it != route_list->children().end(); ++it) { for (Gtk::ListStore::Children::iterator it = route_list->children().begin(); it != route_list->children().end(); ++it) {
Glib::ustring label = it->get_value(route_cols.selected) ? "(none)" : ""; std::string label = it->get_value(route_cols.selected) ? "(none)" : "";
it->set_value (route_cols.get_channel (n_channels).label, label); it->set_value (route_cols.get_channel (n_channels).label, label);
it->set_value (route_cols.get_channel (n_channels).port, (AudioPort *) 0); it->set_value (route_cols.get_channel (n_channels).port, (AudioPort *) 0);
} }
@ -384,7 +384,7 @@ PortExportChannelSelector::ChannelTreeView::update_config ()
} }
void void
PortExportChannelSelector::ChannelTreeView::update_toggle_selection (Glib::ustring const & path) PortExportChannelSelector::ChannelTreeView::update_toggle_selection (std::string const & path)
{ {
Gtk::TreeModel::iterator iter = get_model ()->get_iter (path); Gtk::TreeModel::iterator iter = get_model ()->get_iter (path);
bool selected = iter->get_value (route_cols.selected); bool selected = iter->get_value (route_cols.selected);
@ -392,11 +392,11 @@ PortExportChannelSelector::ChannelTreeView::update_toggle_selection (Glib::ustri
for (uint32_t i = 1; i <= n_channels; ++i) { for (uint32_t i = 1; i <= n_channels; ++i) {
if (!selected) { if (!selected) {
iter->set_value (route_cols.get_channel (i).label, Glib::ustring ("")); iter->set_value (route_cols.get_channel (i).label, std::string (""));
continue; continue;
} }
iter->set_value (route_cols.get_channel (i).label, Glib::ustring("(none)")); iter->set_value (route_cols.get_channel (i).label, std::string("(none)"));
iter->set_value (route_cols.get_channel (i).port, (AudioPort *) 0); iter->set_value (route_cols.get_channel (i).port, (AudioPort *) 0);
Glib::RefPtr<Gtk::ListStore> port_list = iter->get_value (route_cols.port_list_col); Glib::RefPtr<Gtk::ListStore> port_list = iter->get_value (route_cols.port_list_col);
@ -405,7 +405,7 @@ PortExportChannelSelector::ChannelTreeView::update_toggle_selection (Glib::ustri
for (port_it = port_list->children().begin(); port_it != port_list->children().end(); ++port_it) { for (port_it = port_list->children().begin(); port_it != port_list->children().end(); ++port_it) {
if (port_number == i) { if (port_number == i) {
iter->set_value (route_cols.get_channel (i).label, (Glib::ustring) (*port_it)->get_value (route_cols.port_cols.label)); iter->set_value (route_cols.get_channel (i).label, (std::string) (*port_it)->get_value (route_cols.port_cols.label));
iter->set_value (route_cols.get_channel (i).port, (AudioPort *) (*port_it)->get_value (route_cols.port_cols.port)); iter->set_value (route_cols.get_channel (i).port, (AudioPort *) (*port_it)->get_value (route_cols.port_cols.port));
} }
@ -417,7 +417,7 @@ PortExportChannelSelector::ChannelTreeView::update_toggle_selection (Glib::ustri
} }
void void
PortExportChannelSelector::ChannelTreeView::update_selection_text (Glib::ustring const & path, Glib::ustring const & new_text, uint32_t channel) PortExportChannelSelector::ChannelTreeView::update_selection_text (std::string const & path, std::string const & new_text, uint32_t channel)
{ {
Gtk::TreeModel::iterator iter = get_model ()->get_iter (path); Gtk::TreeModel::iterator iter = get_model ()->get_iter (path);
iter->set_value (route_cols.get_channel (channel).label, new_text); iter->set_value (route_cols.get_channel (channel).label, new_text);
@ -426,7 +426,7 @@ PortExportChannelSelector::ChannelTreeView::update_selection_text (Glib::ustring
Gtk::ListStore::Children::iterator port_it; Gtk::ListStore::Children::iterator port_it;
for (port_it = port_list->children().begin(); port_it != port_list->children().end(); ++port_it) { for (port_it = port_list->children().begin(); port_it != port_list->children().end(); ++port_it) {
Glib::ustring label = port_it->get_value (route_cols.port_cols.label); std::string label = port_it->get_value (route_cols.port_cols.label);
if (label == new_text) { if (label == new_text) {
iter->set_value (route_cols.get_channel (channel).port, (AudioPort *) (*port_it)[route_cols.port_cols.port]); iter->set_value (route_cols.get_channel (channel).port, (AudioPort *) (*port_it)[route_cols.port_cols.port]);
} }

10
gtk2_ardour/export_channel_selector.h
View file

@ -114,7 +114,7 @@ class PortExportChannelSelector : public ExportChannelSelector
/* Static columns */ /* Static columns */
Gtk::TreeModelColumn<bool> selected; Gtk::TreeModelColumn<bool> selected;
Gtk::TreeModelColumn<Glib::ustring> name; Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<ARDOUR::IO *> io; Gtk::TreeModelColumn<ARDOUR::IO *> io;
/* Combo list column (shared by all channels) */ /* Combo list column (shared by all channels) */
@ -129,7 +129,7 @@ class PortExportChannelSelector : public ExportChannelSelector
Channel (RouteCols & cols) { cols.add (port); cols.add (label); } Channel (RouteCols & cols) { cols.add (port); cols.add (label); }
Gtk::TreeModelColumn<ARDOUR::AudioPort *> port; Gtk::TreeModelColumn<ARDOUR::AudioPort *> port;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
}; };
std::list<Channel> channels; std::list<Channel> channels;
@ -147,7 +147,7 @@ class PortExportChannelSelector : public ExportChannelSelector
Gtk::TreeModelColumn<bool> selected; // not used ATM Gtk::TreeModelColumn<bool> selected; // not used ATM
Gtk::TreeModelColumn<ARDOUR::AudioPort *> port; Gtk::TreeModelColumn<ARDOUR::AudioPort *> port;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
}; };
PortCols port_cols; PortCols port_cols;
}; };
@ -175,8 +175,8 @@ class PortExportChannelSelector : public ExportChannelSelector
/* Signal handlers for selections changes in the view */ /* Signal handlers for selections changes in the view */
void update_toggle_selection (Glib::ustring const & path); void update_toggle_selection (std::string const & path);
void update_selection_text (Glib::ustring const & path, Glib::ustring const & new_text, uint32_t channel); void update_selection_text (std::string const & path, std::string const & new_text, uint32_t channel);
RouteCols route_cols; RouteCols route_cols;
Glib::RefPtr<Gtk::ListStore> route_list; Glib::RefPtr<Gtk::ListStore> route_list;

4
gtk2_ardour/export_dialog.cc
View file

@ -35,7 +35,7 @@ using namespace ARDOUR;
using namespace PBD; using namespace PBD;
using std::string; using std::string;
ExportDialog::ExportDialog (PublicEditor & editor, Glib::ustring title) : ExportDialog::ExportDialog (PublicEditor & editor, std::string title) :
ArdourDialog (title), ArdourDialog (title),
editor (editor), editor (editor),
@ -198,7 +198,7 @@ void
ExportDialog::notify_errors () ExportDialog::notify_errors ()
{ {
if (status->errors()) { if (status->errors()) {
Glib::ustring txt = _("Export has been aborted due to an error!\nSee the Log for details."); std::string txt = _("Export has been aborted due to an error!\nSee the Log for details.");
Gtk::MessageDialog msg (txt, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); Gtk::MessageDialog msg (txt, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
msg.run(); msg.run();
} }

6
gtk2_ardour/export_dialog.h
View file

@ -47,7 +47,7 @@ class ExportDialog : public ArdourDialog {
public: public:
explicit ExportDialog (PublicEditor & editor, Glib::ustring title); explicit ExportDialog (PublicEditor & editor, std::string title);
~ExportDialog (); ~ExportDialog ();
void set_session (ARDOUR::Session* s); void set_session (ARDOUR::Session* s);
@ -114,12 +114,12 @@ class ExportDialog : public ArdourDialog {
Gtk::HBox warn_hbox; Gtk::HBox warn_hbox;
Gtk::Label warn_label; Gtk::Label warn_label;
Glib::ustring warn_string; std::string warn_string;
Gtk::HBox list_files_hbox; Gtk::HBox list_files_hbox;
Gtk::Label list_files_label; Gtk::Label list_files_label;
Gtk::Button list_files_button; Gtk::Button list_files_button;
Glib::ustring list_files_string; std::string list_files_string;
void add_error (std::string const & text); void add_error (std::string const & text);
void add_warning (std::string const & text); void add_warning (std::string const & text);

4
gtk2_ardour/export_file_notebook.cc
View file

@ -88,7 +88,7 @@ ExportFileNotebook::sync_with_manager ()
CriticalSelectionChanged (); CriticalSelectionChanged ();
} }
Glib::ustring std::string
ExportFileNotebook::get_nth_format_name (uint32_t n) ExportFileNotebook::get_nth_format_name (uint32_t n)
{ {
FilePage * page; FilePage * page;
@ -232,7 +232,7 @@ ExportFileNotebook::FilePage::set_remove_sensitive (bool value)
tab_close_button.set_sensitive (value); tab_close_button.set_sensitive (value);
} }
Glib::ustring std::string
ExportFileNotebook::FilePage::get_format_name () const ExportFileNotebook::FilePage::get_format_name () const
{ {
if (format_state && format_state->format) { if (format_state && format_state->format) {

4
gtk2_ardour/export_file_notebook.h
View file

@ -39,7 +39,7 @@ class ExportFileNotebook : public Gtk::Notebook, public ARDOUR::SessionHandlePtr
void set_session_and_manager (ARDOUR::Session * s, boost::shared_ptr<ARDOUR::ExportProfileManager> manager); void set_session_and_manager (ARDOUR::Session * s, boost::shared_ptr<ARDOUR::ExportProfileManager> manager);
void sync_with_manager (); void sync_with_manager ();
Glib::ustring get_nth_format_name (uint32_t n); std::string get_nth_format_name (uint32_t n);
sigc::signal<void> CriticalSelectionChanged; sigc::signal<void> CriticalSelectionChanged;
@ -77,7 +77,7 @@ class ExportFileNotebook : public Gtk::Notebook, public ARDOUR::SessionHandlePtr
Gtk::Widget & get_tab_widget () { return tab_widget; } Gtk::Widget & get_tab_widget () { return tab_widget; }
void set_remove_sensitive (bool value); void set_remove_sensitive (bool value);
Glib::ustring get_format_name () const; std::string get_format_name () const;
ARDOUR::ExportProfileManager::FormatStatePtr get_format_state () const { return format_state; } ARDOUR::ExportProfileManager::FormatStatePtr get_format_state () const { return format_state; }
ARDOUR::ExportProfileManager::FilenameStatePtr get_filename_state () const { return filename_state; } ARDOUR::ExportProfileManager::FilenameStatePtr get_filename_state () const { return filename_state; }

2
gtk2_ardour/export_filename_selector.cc
View file

@ -294,7 +294,7 @@ ExportFilenameSelector::open_browse_dialog ()
int result = dialog.run(); int result = dialog.run();
if (result == Gtk::RESPONSE_OK) { if (result == Gtk::RESPONSE_OK) {
Glib::ustring filename = dialog.get_filename(); std::string filename = dialog.get_filename();
if (filename.length()) { if (filename.length()) {
path_entry.set_text (filename); path_entry.set_text (filename);

4
gtk2_ardour/export_filename_selector.h
View file

@ -88,7 +88,7 @@ class ExportFilenameSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
{ {
public: public:
Gtk::TreeModelColumn<DateFormat> format; Gtk::TreeModelColumn<DateFormat> format;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
DateFormatCols () { add(format); add(label); } DateFormatCols () { add(format); add(label); }
}; };
@ -104,7 +104,7 @@ class ExportFilenameSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
{ {
public: public:
Gtk::TreeModelColumn<TimeFormat> format; Gtk::TreeModelColumn<TimeFormat> format;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
TimeFormatCols () { add(format); add(label); } TimeFormatCols () { add(format); add(label); }
}; };

4
gtk2_ardour/export_format_dialog.cc
View file

@ -485,7 +485,7 @@ ExportFormatDialog::init_encoding_option_widgets ()
} }
void void
ExportFormatDialog::update_compatibility_selection (Glib::ustring const & path) ExportFormatDialog::update_compatibility_selection (std::string const & path)
{ {
Gtk::TreeModel::iterator iter = compatibility_view.get_model ()->get_iter (path); Gtk::TreeModel::iterator iter = compatibility_view.get_model ()->get_iter (path);
@ -668,7 +668,7 @@ ExportFormatDialog::change_dither_type_compatibility (bool compatibility, WeakDi
template<typename T, typename ColsT> template<typename T, typename ColsT>
void void
ExportFormatDialog::change_compatibility (bool compatibility, boost::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore> & list, ColsT & cols, ExportFormatDialog::change_compatibility (bool compatibility, boost::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore> & list, ColsT & cols,
Glib::ustring const & c_incompatible, Glib::ustring const & c_compatible) std::string const & c_incompatible, std::string const & c_compatible)
{ {
boost::shared_ptr<T> ptr = w_ptr.lock(); boost::shared_ptr<T> ptr = w_ptr.lock();

28
gtk2_ardour/export_format_dialog.h
View file

@ -77,7 +77,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
/* These are connected to signals from GUI components, and should change element states */ /* These are connected to signals from GUI components, and should change element states */
void update_compatibility_selection (Glib::ustring const & path); void update_compatibility_selection (std::string const & path);
void update_quality_selection (); void update_quality_selection ();
void update_format_selection (); void update_format_selection ();
void update_sample_rate_selection (); void update_sample_rate_selection ();
@ -108,7 +108,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
template<typename T, typename ColsT> template<typename T, typename ColsT>
void change_compatibility (bool compatibility, boost::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore> & list, ColsT & cols, void change_compatibility (bool compatibility, boost::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore> & list, ColsT & cols,
Glib::ustring const & c_incompatible = "red", Glib::ustring const & c_compatible = "white"); std::string const & c_incompatible = "red", std::string const & c_compatible = "white");
uint32_t applying_changes_from_engine; uint32_t applying_changes_from_engine;
@ -179,7 +179,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
public: public:
Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::CompatPtr> ptr; Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::CompatPtr> ptr;
Gtk::TreeModelColumn<bool> selected; Gtk::TreeModelColumn<bool> selected;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
CompatibilityCols () { add(ptr); add(selected); add(label); } CompatibilityCols () { add(ptr); add(selected); add(label); }
}; };
@ -194,8 +194,8 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
{ {
public: public:
Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::QualityPtr> ptr; Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::QualityPtr> ptr;
Gtk::TreeModelColumn<Glib::ustring> color; Gtk::TreeModelColumn<std::string> color;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
QualityCols () { add(ptr); add(color); add(label); } QualityCols () { add(ptr); add(color); add(label); }
}; };
@ -206,8 +206,8 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
{ {
public: public:
Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::FormatPtr> ptr; Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::FormatPtr> ptr;
Gtk::TreeModelColumn<Glib::ustring> color; Gtk::TreeModelColumn<std::string> color;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
FormatCols () { add(ptr); add(color); add(label); } FormatCols () { add(ptr); add(color); add(label); }
}; };
@ -218,8 +218,8 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
{ {
public: public:
Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::SampleRatePtr> ptr; Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::SampleRatePtr> ptr;
Gtk::TreeModelColumn<Glib::ustring> color; Gtk::TreeModelColumn<std::string> color;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
SampleRateCols () { add(ptr); add(color); add(label); } SampleRateCols () { add(ptr); add(color); add(label); }
}; };
@ -244,7 +244,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
{ {
public: public:
Gtk::TreeModelColumn<ARDOUR::ExportFormatBase::SRCQuality> id; Gtk::TreeModelColumn<ARDOUR::ExportFormatBase::SRCQuality> id;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
SRCQualityCols () { add(id); add(label); } SRCQualityCols () { add(id); add(label); }
}; };
@ -274,8 +274,8 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
{ {
public: public:
Gtk::TreeModelColumn<ARDOUR::HasSampleFormat::SampleFormatPtr> ptr; Gtk::TreeModelColumn<ARDOUR::HasSampleFormat::SampleFormatPtr> ptr;
Gtk::TreeModelColumn<Glib::ustring> color; Gtk::TreeModelColumn<std::string> color;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
SampleFormatCols () { add(ptr); add(color); add(label); } SampleFormatCols () { add(ptr); add(color); add(label); }
}; };
@ -286,8 +286,8 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
{ {
public: public:
Gtk::TreeModelColumn<ARDOUR::HasSampleFormat::DitherTypePtr> ptr; Gtk::TreeModelColumn<ARDOUR::HasSampleFormat::DitherTypePtr> ptr;
Gtk::TreeModelColumn<Glib::ustring> color; Gtk::TreeModelColumn<std::string> color;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
DitherTypeCols () { add(ptr); add (color); add(label); } DitherTypeCols () { add(ptr); add (color); add(label); }
}; };

4
gtk2_ardour/export_multiplicator.cc
View file

@ -254,7 +254,7 @@ ExportMultiplicator::get_hbox (TablePosition position)
return widget; return widget;
} }
ExportMultiplicator::ButtonWidget::ButtonWidget (Glib::ustring name, boost::shared_ptr<ExportProfileManager> m, ExportProfileManager::GraphNode * node) : ExportMultiplicator::ButtonWidget::ButtonWidget (std::string name, boost::shared_ptr<ExportProfileManager> m, ExportProfileManager::GraphNode * node) :
label (name), label (name),
node (node), node (node),
split_position (0.5) split_position (0.5)
@ -268,7 +268,7 @@ ExportMultiplicator::ButtonWidget::ButtonWidget (Glib::ustring name, boost::shar
ui_manager = Gtk::UIManager::create(); ui_manager = Gtk::UIManager::create();
ui_manager->insert_action_group (menu_actions); ui_manager->insert_action_group (menu_actions);
Glib::ustring ui_info = std::string ui_info =
"<ui>" "<ui>"
" <popup name='PopupMenu'>" " <popup name='PopupMenu'>"
" <menuitem action='Split'/>" " <menuitem action='Split'/>"

2
gtk2_ardour/export_multiplicator.h
View file

@ -93,7 +93,7 @@ class ExportMultiplicator : public Gtk::EventBox {
class ButtonWidget : public Gtk::EventBox { class ButtonWidget : public Gtk::EventBox {
public: public:
ButtonWidget (Glib::ustring name, boost::shared_ptr<ExportProfileManager> m, ExportProfileManager::GraphNode * node); ButtonWidget (std::string name, boost::shared_ptr<ExportProfileManager> m, ExportProfileManager::GraphNode * node);
private: private:

4
gtk2_ardour/export_preset_selector.cc
View file

@ -75,7 +75,7 @@ ExportPresetSelector::sync_with_manager ()
for (PresetList::const_iterator it = presets.begin(); it != presets.end(); ++it) { for (PresetList::const_iterator it = presets.begin(); it != presets.end(); ++it) {
tree_it = list->append(); tree_it = list->append();
tree_it->set_value (cols.preset, *it); tree_it->set_value (cols.preset, *it);
tree_it->set_value (cols.label, Glib::ustring ((*it)->name())); tree_it->set_value (cols.label, std::string ((*it)->name()));
if (*it == current) { if (*it == current) {
select_connection.block (true); select_connection.block (true);
@ -89,7 +89,7 @@ void
ExportPresetSelector::update_selection () ExportPresetSelector::update_selection ()
{ {
Gtk::ListStore::iterator it = entry.get_active (); Gtk::ListStore::iterator it = entry.get_active ();
Glib::ustring text = entry.get_entry()->get_text(); std::string text = entry.get_entry()->get_text();
bool preset_name_exists = false; bool preset_name_exists = false;
for (PresetList::const_iterator it = profile_manager->get_presets().begin(); it != profile_manager->get_presets().end(); ++it) { for (PresetList::const_iterator it = profile_manager->get_presets().begin(); it != profile_manager->get_presets().end(); ++it) {

2
gtk2_ardour/export_preset_selector.h
View file

@ -55,7 +55,7 @@ class ExportPresetSelector : public Gtk::HBox
{ {
public: public:
Gtk::TreeModelColumn<PresetPtr> preset; Gtk::TreeModelColumn<PresetPtr> preset;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
PresetCols () { add (preset); add (label); } PresetCols () { add (preset); add (label); }
}; };

25
gtk2_ardour/export_timespan_selector.cc
View file

@ -39,6 +39,7 @@
using namespace Glib; using namespace Glib;
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; using namespace PBD;
using std::string;
ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, ProfileManagerPtr manager) : ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, ProfileManagerPtr manager) :
manager (manager), manager (manager),
@ -102,7 +103,7 @@ ExportTimespanSelector::add_range_to_selection (ARDOUR::Location const * loc)
{ {
TimespanPtr span = _session->get_export_handler()->add_timespan(); TimespanPtr span = _session->get_export_handler()->add_timespan();
Glib::ustring id; std::string id;
if (loc == state->session_range.get()) { if (loc == state->session_range.get()) {
id = "session"; id = "session";
} else if (loc == state->selection_range.get()) { } else if (loc == state->selection_range.get()) {
@ -147,12 +148,12 @@ ExportTimespanSelector::change_time_format ()
} }
} }
Glib::ustring std::string
ExportTimespanSelector::construct_label (ARDOUR::Location const * location) const ExportTimespanSelector::construct_label (ARDOUR::Location const * location) const
{ {
Glib::ustring label; std::string label;
Glib::ustring start; std::string start;
Glib::ustring end; std::string end;
nframes_t start_frame = location->start(); nframes_t start_frame = location->start();
nframes_t end_frame = location->end(); nframes_t end_frame = location->end();
@ -198,7 +199,7 @@ ExportTimespanSelector::construct_label (ARDOUR::Location const * location) cons
} }
Glib::ustring std::string
ExportTimespanSelector::bbt_str (nframes_t frames) const ExportTimespanSelector::bbt_str (nframes_t frames) const
{ {
if (!_session) { if (!_session) {
@ -221,7 +222,7 @@ ExportTimespanSelector::bbt_str (nframes_t frames) const
return oss.str(); return oss.str();
} }
Glib::ustring std::string
ExportTimespanSelector::timecode_str (nframes_t frames) const ExportTimespanSelector::timecode_str (nframes_t frames) const
{ {
if (!_session) { if (!_session) {
@ -246,7 +247,7 @@ ExportTimespanSelector::timecode_str (nframes_t frames) const
return oss.str(); return oss.str();
} }
Glib::ustring std::string
ExportTimespanSelector::ms_str (nframes_t frames) const ExportTimespanSelector::ms_str (nframes_t frames) const
{ {
if (!_session) { if (!_session) {
@ -283,7 +284,7 @@ ExportTimespanSelector::ms_str (nframes_t frames) const
} }
void void
ExportTimespanSelector::update_range_name (Glib::ustring const & path, Glib::ustring const & new_text) ExportTimespanSelector::update_range_name (std::string const & path, std::string const & new_text)
{ {
Gtk::TreeStore::iterator it = range_list->get_iter (path); Gtk::TreeStore::iterator it = range_list->get_iter (path);
it->get_value (range_cols.location)->set_name (new_text); it->get_value (range_cols.location)->set_name (new_text);
@ -293,7 +294,7 @@ ExportTimespanSelector::update_range_name (Glib::ustring const & path, Glib::ust
/*** ExportTimespanSelectorSingle ***/ /*** ExportTimespanSelectorSingle ***/
ExportTimespanSelectorSingle::ExportTimespanSelectorSingle (ARDOUR::Session * session, ProfileManagerPtr manager, Glib::ustring range_id) : ExportTimespanSelectorSingle::ExportTimespanSelectorSingle (ARDOUR::Session * session, ProfileManagerPtr manager, std::string range_id) :
ExportTimespanSelector (session, manager), ExportTimespanSelector (session, manager),
range_id (range_id) range_id (range_id)
{ {
@ -322,7 +323,7 @@ ExportTimespanSelectorSingle::fill_range_list ()
{ {
if (!state) { return; } if (!state) { return; }
Glib::ustring id; std::string id;
if (!range_id.compare (X_("session"))) { if (!range_id.compare (X_("session"))) {
id = state->session_range->id().to_s(); id = state->session_range->id().to_s();
} else if (!range_id.compare (X_("selection"))) { } else if (!range_id.compare (X_("selection"))) {
@ -408,7 +409,7 @@ ExportTimespanSelectorMultiple::set_selection_from_state ()
Gtk::TreeModel::Children::iterator tree_it; Gtk::TreeModel::Children::iterator tree_it;
for (TimespanList::iterator it = state->timespans->begin(); it != state->timespans->end(); ++it) { for (TimespanList::iterator it = state->timespans->begin(); it != state->timespans->end(); ++it) {
ustring id = (*it)->range_id(); string id = (*it)->range_id();
for (tree_it = range_list->children().begin(); tree_it != range_list->children().end(); ++tree_it) { for (tree_it = range_list->children().begin(); tree_it != range_list->children().end(); ++tree_it) {
Location * loc = tree_it->get_value (range_cols.location); Location * loc = tree_it->get_value (range_cols.location);

20
gtk2_ardour/export_timespan_selector.h
View file

@ -76,12 +76,12 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
void change_time_format (); void change_time_format ();
Glib::ustring construct_label (ARDOUR::Location const * location) const; std::string construct_label (ARDOUR::Location const * location) const;
Glib::ustring bbt_str (nframes_t frames) const; std::string bbt_str (nframes_t frames) const;
Glib::ustring timecode_str (nframes_t frames) const; std::string timecode_str (nframes_t frames) const;
Glib::ustring ms_str (nframes_t frames) const; std::string ms_str (nframes_t frames) const;
void update_range_name (Glib::ustring const & path, Glib::ustring const & new_text); void update_range_name (std::string const & path, std::string const & new_text);
/*** GUI components ***/ /*** GUI components ***/
@ -96,7 +96,7 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
{ {
public: public:
Gtk::TreeModelColumn<TimeFormat> format; Gtk::TreeModelColumn<TimeFormat> format;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
TimeFormatCols () { add(format); add(label); } TimeFormatCols () { add(format); add(label); }
}; };
@ -110,9 +110,9 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
{ {
public: public:
Gtk::TreeModelColumn<ARDOUR::Location *> location; Gtk::TreeModelColumn<ARDOUR::Location *> location;
Gtk::TreeModelColumn<Glib::ustring> label; Gtk::TreeModelColumn<std::string> label;
Gtk::TreeModelColumn<bool> selected; Gtk::TreeModelColumn<bool> selected;
Gtk::TreeModelColumn<Glib::ustring> name; Gtk::TreeModelColumn<std::string> name;
RangeCols () { add (location); add(label); add(selected); add(name); } RangeCols () { add (location); add(label); add(selected); add(name); }
}; };
@ -143,13 +143,13 @@ class ExportTimespanSelectorMultiple : public ExportTimespanSelector
class ExportTimespanSelectorSingle : public ExportTimespanSelector class ExportTimespanSelectorSingle : public ExportTimespanSelector
{ {
public: public:
ExportTimespanSelectorSingle (ARDOUR::Session * session, ProfileManagerPtr manager, Glib::ustring range_id); ExportTimespanSelectorSingle (ARDOUR::Session * session, ProfileManagerPtr manager, std::string range_id);
private: private:
virtual void fill_range_list (); virtual void fill_range_list ();
Glib::ustring range_id; std::string range_id;
}; };

2
gtk2_ardour/itest.cc
View file

@ -46,7 +46,7 @@ struct ModelColumns : public TreeModel::ColumnRecord {
add (port); add (port);
} }
TreeModelColumn<bool> used; TreeModelColumn<bool> used;
TreeModelColumn<ustring> text; TreeModelColumn<string> text;
TreeModelColumn<jack_port_t*> port; TreeModelColumn<jack_port_t*> port;
}; };

3
gtk2_ardour/keyeditor.h
View file

@ -7,7 +7,6 @@
#include <gtkmm/treeview.h> #include <gtkmm/treeview.h>
#include <gtkmm/treestore.h> #include <gtkmm/treestore.h>
#include <gtkmm/scrolledwindow.h> #include <gtkmm/scrolledwindow.h>
#include <glibmm/ustring.h>
#include "ardour_dialog.h" #include "ardour_dialog.h"
@ -30,7 +29,7 @@ class KeyEditor : public ArdourDialog
add (path); add (path);
add (bindable); add (bindable);
} }
Gtk::TreeModelColumn<Glib::ustring> action; Gtk::TreeModelColumn<std::string> action;
Gtk::TreeModelColumn<std::string> binding; Gtk::TreeModelColumn<std::string> binding;
Gtk::TreeModelColumn<std::string> path; Gtk::TreeModelColumn<std::string> path;
Gtk::TreeModelColumn<bool> bindable; Gtk::TreeModelColumn<bool> bindable;

4
gtk2_ardour/latency_gui.cc
View file

@ -118,7 +118,7 @@ LatencyGUI::refresh ()
void void
LatencyGUI::change_latency_from_button (int dir) LatencyGUI::change_latency_from_button (int dir)
{ {
Glib::ustring unitstr = units_combo.get_active_text(); std::string unitstr = units_combo.get_active_text();
double shift = 0.0; double shift = 0.0;
if (unitstr == unit_strings[0]) { if (unitstr == unit_strings[0]) {
@ -140,7 +140,7 @@ LatencyGUI::change_latency_from_button (int dir)
} }
} }
LatencyDialog::LatencyDialog (const Glib::ustring& title, Latent& l, nframes64_t sr, nframes64_t psz) LatencyDialog::LatencyDialog (const std::string& title, Latent& l, nframes64_t sr, nframes64_t psz)
: ArdourDialog (title, false, true), : ArdourDialog (title, false, true),
lwidget (l, sr, psz) lwidget (l, sr, psz)
{ {

2
gtk2_ardour/latency_gui.h
View file

@ -72,7 +72,7 @@ class LatencyGUI : public Gtk::VBox
class LatencyDialog : public ArdourDialog class LatencyDialog : public ArdourDialog
{ {
public: public:
LatencyDialog (const Glib::ustring& title, ARDOUR::Latent&, nframes64_t sample_rate, nframes64_t period_size); LatencyDialog (const std::string& title, ARDOUR::Latent&, nframes64_t sample_rate, nframes64_t period_size);
~LatencyDialog() {} ~LatencyDialog() {}
private: private:

4
gtk2_ardour/lv2_plugin_ui.cc
View file

@ -128,7 +128,7 @@ LV2PluginUI::LV2PluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<
} }
void void
LV2PluginUI::lv2ui_instantiate(const Glib::ustring& title) LV2PluginUI::lv2ui_instantiate(const std::string& title)
{ {
LV2_Feature** features; LV2_Feature** features;
LV2_Feature** features_src; LV2_Feature** features_src;
@ -274,7 +274,7 @@ LV2PluginUI::is_update_wanted(uint32_t /*index*/)
} }
bool bool
LV2PluginUI::on_window_show(const Glib::ustring& title) LV2PluginUI::on_window_show(const std::string& title)
{ {
//cout << "on_window_show - " << title << endl; flush(cout); //cout << "on_window_show - " << title << endl; flush(cout);

4
gtk2_ardour/lv2_plugin_ui.h
View file

@ -81,7 +81,7 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox
uint32_t format, uint32_t format,
const void* buffer); const void* buffer);
void lv2ui_instantiate(const Glib::ustring& title); void lv2ui_instantiate(const std::string& title);
void parameter_changed(uint32_t, float); void parameter_changed(uint32_t, float);
void parameter_update(uint32_t, float); void parameter_update(uint32_t, float);
@ -90,7 +90,7 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox
void output_update(); void output_update();
bool is_update_wanted(uint32_t index); bool is_update_wanted(uint32_t index);
virtual bool on_window_show(const Glib::ustring& title); virtual bool on_window_show(const std::string& title);
virtual void on_window_hide(); virtual void on_window_hide();
PBD::ScopedConnection parameter_connection; PBD::ScopedConnection parameter_connection;

8
gtk2_ardour/main.cc
View file

@ -117,9 +117,9 @@ fixup_bundle_environment ()
_NSGetExecutablePath (execpath, &pathsz); _NSGetExecutablePath (execpath, &pathsz);
Glib::ustring exec_path (execpath); std::string exec_path (execpath);
Glib::ustring dir_path = Glib::path_get_dirname (exec_path); std::string dir_path = Glib::path_get_dirname (exec_path);
Glib::ustring path; std::string path;
const char *cstr = getenv ("PATH"); const char *cstr = getenv ("PATH");
/* ensure that we find any bundled executables (e.g. JACK), /* ensure that we find any bundled executables (e.g. JACK),
@ -367,7 +367,7 @@ int ardour_main (int argc, char *argv[])
int main (int argc, char *argv[]) int main (int argc, char *argv[])
#endif #endif
{ {
vector<Glib::ustring> null_file_list; vector<std::string> null_file_list;
#ifdef __APPLE__ #ifdef __APPLE__
fixup_bundle_environment (); fixup_bundle_environment ();

2
gtk2_ardour/marker.cc
View file

@ -357,7 +357,7 @@ Marker::set_name (const string& new_name)
{ {
int name_width = pixel_width (new_name, *name_font) + 2; int name_width = pixel_width (new_name, *name_font) + 2;
name_pixbuf->property_pixbuf() = pixbuf_from_ustring(new_name, name_font, name_width, name_height, Gdk::Color ("#000000")); name_pixbuf->property_pixbuf() = pixbuf_from_string(new_name, name_font, name_width, name_height, Gdk::Color ("#000000"));
if (_type == End || _type == LoopEnd || _type == PunchOut) { if (_type == End || _type == LoopEnd || _type == PunchOut) {
name_pixbuf->property_x() = - (name_width); name_pixbuf->property_x() = - (name_width);

4
gtk2_ardour/midi_list_editor.cc
View file

@ -148,7 +148,7 @@ MidiListEditor::delete_selected_note ()
} }
void void
MidiListEditor::editing_started (CellEditable*, const ustring& path, int colno) MidiListEditor::editing_started (CellEditable*, const string& path, int colno)
{ {
_current_edit = path; _current_edit = path;
cerr << "Now editing " << _current_edit << " Column " << colno << endl; cerr << "Now editing " << _current_edit << " Column " << colno << endl;
@ -161,7 +161,7 @@ MidiListEditor::editing_canceled ()
} }
void void
MidiListEditor::edited (const Glib::ustring& path, const Glib::ustring& /* text */) MidiListEditor::edited (const std::string& path, const std::string& /* text */)
{ {
TreeModel::iterator iter = model->get_iter (path); TreeModel::iterator iter = model->get_iter (path);

6
gtk2_ardour/midi_list_editor.h
View file

@ -70,12 +70,12 @@ class MidiListEditor : public ArdourDialog
Glib::RefPtr<Gtk::ListStore> model; Glib::RefPtr<Gtk::ListStore> model;
Gtk::TreeView view; Gtk::TreeView view;
Gtk::ScrolledWindow scroller; Gtk::ScrolledWindow scroller;
Glib::ustring _current_edit; std::string _current_edit;
boost::shared_ptr<ARDOUR::MidiRegion> region; boost::shared_ptr<ARDOUR::MidiRegion> region;
void edited (const Glib::ustring&, const Glib::ustring&); void edited (const std::string&, const std::string&);
void editing_started (Gtk::CellEditable*, const Glib::ustring& path, int); void editing_started (Gtk::CellEditable*, const std::string& path, int);
void editing_canceled (); void editing_canceled ();
void redisplay_model (); void redisplay_model ();

4
gtk2_ardour/mixer_ui.cc
View file

@ -1215,7 +1215,7 @@ Mixer_UI::route_group_property_changed (RouteGroup* group, const PropertyChange&
} }
void void
Mixer_UI::route_group_name_edit (const Glib::ustring& path, const Glib::ustring& new_text) Mixer_UI::route_group_name_edit (const std::string& path, const std::string& new_text)
{ {
RouteGroup* group; RouteGroup* group;
TreeIter iter; TreeIter iter;
@ -1259,7 +1259,7 @@ Mixer_UI::route_group_row_change (const Gtk::TreeModel::Path&, const Gtk::TreeMo
} }
} }
Glib::ustring name = (*iter)[group_columns.text]; std::string name = (*iter)[group_columns.text];
if (name != group->name()) { if (name != group->name()) {
group->set_name (name); group->set_name (name);

6
gtk2_ardour/mixer_ui.h
View file

@ -187,7 +187,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
void disable_all_route_groups (); void disable_all_route_groups ();
void add_route_group (ARDOUR::RouteGroup *); void add_route_group (ARDOUR::RouteGroup *);
void route_groups_changed (); void route_groups_changed ();
void route_group_name_edit (const Glib::ustring&, const Glib::ustring&); void route_group_name_edit (const std::string&, const std::string&);
void route_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter); void route_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter);
Gtk::Menu *track_menu; Gtk::Menu *track_menu;
@ -210,7 +210,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
add (strip); add (strip);
} }
Gtk::TreeModelColumn<bool> visible; Gtk::TreeModelColumn<bool> visible;
Gtk::TreeModelColumn<Glib::ustring> text; Gtk::TreeModelColumn<std::string> text;
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route; Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
Gtk::TreeModelColumn<MixerStrip*> strip; Gtk::TreeModelColumn<MixerStrip*> strip;
}; };
@ -222,7 +222,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
add (group); add (group);
} }
Gtk::TreeModelColumn<bool> visible; Gtk::TreeModelColumn<bool> visible;
Gtk::TreeModelColumn<Glib::ustring> text; Gtk::TreeModelColumn<std::string> text;
Gtk::TreeModelColumn<ARDOUR::RouteGroup*> group; Gtk::TreeModelColumn<ARDOUR::RouteGroup*> group;
}; };

2
gtk2_ardour/mtest.cc
View file

@ -64,7 +64,7 @@ make_action (Glib::RefPtr<ActionGroup> group, string name, string label)
} }
bool bool
lookup_entry (const ustring accel_path, Gtk::AccelKey& key) lookup_entry (const string accel_path, Gtk::AccelKey& key)
{ {
GtkAccelKey gkey; GtkAccelKey gkey;
bool known = gtk_accel_map_lookup_entry (accel_path.c_str(), &gkey); bool known = gtk_accel_map_lookup_entry (accel_path.c_str(), &gkey);

10
gtk2_ardour/nag.cc
View file

@ -91,7 +91,7 @@ NagScreen::nag ()
NagScreen* NagScreen*
NagScreen::maybe_nag (std::string why) NagScreen::maybe_nag (std::string why)
{ {
Glib::ustring path; std::string path;
bool really_subscribed; bool really_subscribed;
bool maybe_subscribed; bool maybe_subscribed;
@ -113,7 +113,7 @@ NagScreen::maybe_nag (std::string why)
void void
NagScreen::mark_never_again () NagScreen::mark_never_again ()
{ {
Glib::ustring path; std::string path;
path = Glib::build_filename (user_config_directory().to_string(), ".nevernag"); path = Glib::build_filename (user_config_directory().to_string(), ".nevernag");
@ -123,7 +123,7 @@ NagScreen::mark_never_again ()
void void
NagScreen::mark_subscriber () NagScreen::mark_subscriber ()
{ {
Glib::ustring path; std::string path;
path = Glib::build_filename (user_config_directory().to_string(), ".askedaboutsub"); path = Glib::build_filename (user_config_directory().to_string(), ".askedaboutsub");
@ -133,7 +133,7 @@ NagScreen::mark_subscriber ()
void void
NagScreen::mark_affirmed_subscriber () NagScreen::mark_affirmed_subscriber ()
{ {
Glib::ustring path; std::string path;
path = Glib::build_filename (user_config_directory().to_string(), ".isubscribe"); path = Glib::build_filename (user_config_directory().to_string(), ".isubscribe");
@ -143,7 +143,7 @@ NagScreen::mark_affirmed_subscriber ()
bool bool
NagScreen::is_subscribed (bool& really) NagScreen::is_subscribed (bool& really)
{ {
Glib::ustring path; std::string path;
really = false; really = false;

2
gtk2_ardour/opts.cc
View file

@ -42,7 +42,7 @@ char* ARDOUR_COMMAND_LINE::curvetest_file = 0;
bool ARDOUR_COMMAND_LINE::try_hw_optimization = true; bool ARDOUR_COMMAND_LINE::try_hw_optimization = true;
bool ARDOUR_COMMAND_LINE::no_connect_ports = false; bool ARDOUR_COMMAND_LINE::no_connect_ports = false;
string ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin default */ string ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin default */
Glib::ustring ARDOUR_COMMAND_LINE::menus_file = "ardour.menus"; std::string ARDOUR_COMMAND_LINE::menus_file = "ardour.menus";
bool ARDOUR_COMMAND_LINE::finder_invoked_ardour = false; bool ARDOUR_COMMAND_LINE::finder_invoked_ardour = false;
string ARDOUR_COMMAND_LINE::immediate_save; string ARDOUR_COMMAND_LINE::immediate_save;
string ARDOUR_COMMAND_LINE::jack_session_uuid; string ARDOUR_COMMAND_LINE::jack_session_uuid;

3
gtk2_ardour/opts.h
View file

@ -21,7 +21,6 @@
#define __ardour_opts_h__ #define __ardour_opts_h__
#include <string> #include <string>
#include <glibmm/ustring.h>
namespace ARDOUR_COMMAND_LINE { namespace ARDOUR_COMMAND_LINE {
@ -37,7 +36,7 @@ extern bool try_hw_optimization;
extern bool no_connect_ports; extern bool no_connect_ports;
extern bool use_gtk_theme; extern bool use_gtk_theme;
extern std::string keybindings_path; extern std::string keybindings_path;
extern Glib::ustring menus_file; extern std::string menus_file;
extern bool finder_invoked_ardour; extern bool finder_invoked_ardour;
extern std::string immediate_save; extern std::string immediate_save;
extern std::string jack_session_uuid; extern std::string jack_session_uuid;

2
gtk2_ardour/plugin_eq_gui.h
View file

@ -123,7 +123,7 @@ class PluginEqGui : public Gtk::Table
Gtk::TreeModelColumn<float> dBMin; Gtk::TreeModelColumn<float> dBMin;
Gtk::TreeModelColumn<float> dBMax; Gtk::TreeModelColumn<float> dBMax;
Gtk::TreeModelColumn<float> dBStep; Gtk::TreeModelColumn<float> dBStep;
Gtk::TreeModelColumn<Glib::ustring> name; Gtk::TreeModelColumn<std::string> name;
}; };
dBSelectionColumns dBColumns; dBSelectionColumns dBColumns;

12
gtk2_ardour/plugin_selector.cc
View file

@ -636,7 +636,7 @@ PluginSelector::create_by_creator_menu (ARDOUR::PluginInfoList& all_plugs)
{ {
using namespace Menu_Helpers; using namespace Menu_Helpers;
typedef std::map<Glib::ustring,Gtk::Menu*> SubmenuMap; typedef std::map<std::string,Gtk::Menu*> SubmenuMap;
SubmenuMap creator_submenu_map; SubmenuMap creator_submenu_map;
Menu* by_creator = new Menu(); Menu* by_creator = new Menu();
@ -664,7 +664,7 @@ PluginSelector::create_by_creator_menu (ARDOUR::PluginInfoList& all_plugs)
} else { } else {
submenu = new Gtk::Menu; submenu = new Gtk::Menu;
by_creator_items.push_back (MenuElem (creator, *manage (submenu))); by_creator_items.push_back (MenuElem (creator, *manage (submenu)));
creator_submenu_map.insert (pair<Glib::ustring,Menu*> (creator, submenu)); creator_submenu_map.insert (pair<std::string,Menu*> (creator, submenu));
submenu->set_name("ArdourContextMenu"); submenu->set_name("ArdourContextMenu");
} }
submenu->items().push_back (MenuElem ((*i)->name, (sigc::bind (sigc::mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i)))); submenu->items().push_back (MenuElem ((*i)->name, (sigc::bind (sigc::mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i))));
@ -677,7 +677,7 @@ PluginSelector::create_by_category_menu (ARDOUR::PluginInfoList& all_plugs)
{ {
using namespace Menu_Helpers; using namespace Menu_Helpers;
typedef std::map<Glib::ustring,Gtk::Menu*> SubmenuMap; typedef std::map<std::string,Gtk::Menu*> SubmenuMap;
SubmenuMap category_submenu_map; SubmenuMap category_submenu_map;
Menu* by_category = new Menu(); Menu* by_category = new Menu();
@ -700,7 +700,7 @@ PluginSelector::create_by_category_menu (ARDOUR::PluginInfoList& all_plugs)
} else { } else {
submenu = new Gtk::Menu; submenu = new Gtk::Menu;
by_category_items.push_back (MenuElem (category, *manage (submenu))); by_category_items.push_back (MenuElem (category, *manage (submenu)));
category_submenu_map.insert (pair<Glib::ustring,Menu*> (category, submenu)); category_submenu_map.insert (pair<std::string,Menu*> (category, submenu));
submenu->set_name("ArdourContextMenu"); submenu->set_name("ArdourContextMenu");
} }
submenu->items().push_back (MenuElem ((*i)->name, (sigc::bind (sigc::mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i)))); submenu->items().push_back (MenuElem ((*i)->name, (sigc::bind (sigc::mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i))));
@ -723,7 +723,7 @@ PluginSelector::plugin_chosen_from_menu (const PluginInfoPtr& pi)
} }
void void
PluginSelector::favorite_changed (const Glib::ustring& path) PluginSelector::favorite_changed (const std::string& path)
{ {
PluginInfoPtr pi; PluginInfoPtr pi;
@ -759,7 +759,7 @@ PluginSelector::favorite_changed (const Glib::ustring& path)
} }
void void
PluginSelector::hidden_changed (const Glib::ustring& path) PluginSelector::hidden_changed (const std::string& path)
{ {
PluginInfoPtr pi; PluginInfoPtr pi;

4
gtk2_ardour/plugin_selector.h
View file

@ -128,8 +128,8 @@ class PluginSelector : public ArdourDialog
bool show_this_plugin (const ARDOUR::PluginInfoPtr&, const std::string&); bool show_this_plugin (const ARDOUR::PluginInfoPtr&, const std::string&);
void setup_filter_string (std::string&); void setup_filter_string (std::string&);
void favorite_changed (const Glib::ustring& path); void favorite_changed (const std::string& path);
void hidden_changed (const Glib::ustring& path); void hidden_changed (const std::string& path);
bool in_row_change; bool in_row_change;
void plugin_chosen_from_menu (const ARDOUR::PluginInfoPtr&); void plugin_chosen_from_menu (const ARDOUR::PluginInfoPtr&);

2
gtk2_ardour/plugin_ui.cc
View file

@ -239,7 +239,7 @@ PluginUIWindow::on_hide ()
} }
void void
PluginUIWindow::set_title(const Glib::ustring& title) PluginUIWindow::set_title(const std::string& title)
{ {
//cout << "PluginUIWindow::set_title(\"" << title << "\"" << endl; //cout << "PluginUIWindow::set_title(\"" << title << "\"" << endl;
Gtk::Window::set_title(title); Gtk::Window::set_title(title);

8
gtk2_ardour/plugin_ui.h
View file

@ -90,7 +90,7 @@ class PlugUIBase : public virtual sigc::trackable
void latency_button_clicked (); void latency_button_clicked ();
virtual bool on_window_show(const Glib::ustring& /*title*/) { return true; } virtual bool on_window_show(const std::string& /*title*/) { return true; }
virtual void on_window_hide() {} virtual void on_window_hide() {}
virtual void forward_key_event (GdkEventKey*) {} virtual void forward_key_event (GdkEventKey*) {}
@ -254,7 +254,7 @@ class PluginUIWindow : public Gtk::Window
void resize_preferred(); void resize_preferred();
void set_parent (Gtk::Window*); void set_parent (Gtk::Window*);
void set_title(const Glib::ustring& title); void set_title(const std::string& title);
bool on_enter_notify_event (GdkEventCrossing*); bool on_enter_notify_event (GdkEventCrossing*);
@ -268,7 +268,7 @@ class PluginUIWindow : public Gtk::Window
void on_map (); void on_map ();
private: private:
Glib::ustring _title; std::string _title;
PlugUIBase* _pluginui; PlugUIBase* _pluginui;
PBD::ScopedConnection death_connection; PBD::ScopedConnection death_connection;
Gtk::Window* parent; Gtk::Window* parent;
@ -312,7 +312,7 @@ class VSTPluginUI : public PlugUIBase, public Gtk::VBox
add (name); add (name);
add (number); add (number);
} }
Gtk::TreeModelColumn<Glib::ustring> name; Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<int> number; Gtk::TreeModelColumn<int> number;
}; };

6
gtk2_ardour/region_view.cc
View file

@ -427,10 +427,10 @@ RegionView::hide_region_editor()
} }
} }
Glib::ustring std::string
RegionView::make_name () const RegionView::make_name () const
{ {
Glib::ustring str; std::string str;
// XXX nice to have some good icons for this // XXX nice to have some good icons for this
@ -456,7 +456,7 @@ RegionView::make_name () const
void void
RegionView::region_renamed () RegionView::region_renamed ()
{ {
Glib::ustring str = make_name (); std::string str = make_name ();
set_item_name (str, this); set_item_name (str, this);
set_name_text (str); set_name_text (str);

2
gtk2_ardour/region_view.h
View file

@ -116,7 +116,7 @@ class RegionView : public TimeAxisViewItem
virtual void region_renamed (); virtual void region_renamed ();
void region_sync_changed (); void region_sync_changed ();
Glib::ustring make_name () const; std::string make_name () const;
static gint _lock_toggle (ArdourCanvas::Item*, GdkEvent*, void*); static gint _lock_toggle (ArdourCanvas::Item*, GdkEvent*, void*);
void lock_toggle (); void lock_toggle ();

2
gtk2_ardour/route_params_ui.h
View file

@ -150,7 +150,7 @@ class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
add(text); add(text);
add(route); add(route);
} }
Gtk::TreeModelColumn<Glib::ustring> text; Gtk::TreeModelColumn<std::string> text;
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route; Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
}; };

7
gtk2_ardour/route_ui.cc
View file

@ -1393,10 +1393,9 @@ RouteUI::route_rename ()
name_prompter.show_all (); name_prompter.show_all ();
switch (name_prompter.run ()) { switch (name_prompter.run ()) {
case Gtk::RESPONSE_ACCEPT: case Gtk::RESPONSE_ACCEPT:
name_prompter.get_result (result); name_prompter.get_result (result);
if (result.length()) { if (result.length()) {
_route->set_name (result); _route->set_name (result);
} }
break; break;
@ -1547,7 +1546,7 @@ void
RouteUI::save_as_template () RouteUI::save_as_template ()
{ {
sys::path path; sys::path path;
Glib::ustring safe_name; std::string safe_name;
string name; string name;
path = ARDOUR::user_route_template_directory (); path = ARDOUR::user_route_template_directory ();

64
gtk2_ardour/sfdb_ui.cc
View file

@ -73,9 +73,9 @@ using namespace Gtk;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
using namespace Editing; using namespace Editing;
using Glib::ustring; using std::string;
ustring SoundFileBrowser::persistent_folder; string SoundFileBrowser::persistent_folder;
static ImportMode static ImportMode
string2importmode (string str) string2importmode (string str)
@ -213,7 +213,7 @@ SoundFileBox::set_session(Session* s)
} }
bool bool
SoundFileBox::setup_labels (const ustring& filename) SoundFileBox::setup_labels (const string& filename)
{ {
if (!path.empty()) { if (!path.empty()) {
// save existing tags // save existing tags
@ -682,7 +682,7 @@ SoundFileBrowser::found_list_view_selected ()
if (!reset_options ()) { if (!reset_options ()) {
set_response_sensitive (RESPONSE_OK, false); set_response_sensitive (RESPONSE_OK, false);
} else { } else {
ustring file; string file;
TreeView::Selection::ListHandle_Path rows = found_list_view.get_selection()->get_selected_rows (); TreeView::Selection::ListHandle_Path rows = found_list_view.get_selection()->get_selected_rows ();
@ -705,7 +705,7 @@ SoundFileBrowser::freesound_list_view_selected ()
if (!reset_options ()) { if (!reset_options ()) {
set_response_sensitive (RESPONSE_OK, false); set_response_sensitive (RESPONSE_OK, false);
} else { } else {
ustring file; string file;
TreeView::Selection::ListHandle_Path rows = freesound_list_view.get_selection()->get_selected_rows (); TreeView::Selection::ListHandle_Path rows = freesound_list_view.get_selection()->get_selected_rows ();
@ -834,16 +834,16 @@ SoundFileBrowser::freesound_search_thread()
} }
vector<ustring> vector<string>
SoundFileBrowser::get_paths () SoundFileBrowser::get_paths ()
{ {
vector<ustring> results; vector<string> results;
int n = notebook.get_current_page (); int n = notebook.get_current_page ();
if (n == 0) { if (n == 0) {
vector<ustring> filenames = chooser.get_filenames(); vector<string> filenames = chooser.get_filenames();
vector<ustring>::iterator i; vector<string>::iterator i;
for (i = filenames.begin(); i != filenames.end(); ++i) { for (i = filenames.begin(); i != filenames.end(); ++i) {
struct stat buf; struct stat buf;
@ -859,7 +859,7 @@ SoundFileBrowser::get_paths ()
ListPath rows = found_list_view.get_selection()->get_selected_rows (); ListPath rows = found_list_view.get_selection()->get_selected_rows ();
for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) { for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) {
TreeIter iter = found_list->get_iter(*i); TreeIter iter = found_list->get_iter(*i);
ustring str = (*iter)[found_list_columns.pathname]; string str = (*iter)[found_list_columns.pathname];
results.push_back (str); results.push_back (str);
} }
@ -870,7 +870,7 @@ SoundFileBrowser::get_paths ()
ListPath rows = freesound_list_view.get_selection()->get_selected_rows (); ListPath rows = freesound_list_view.get_selection()->get_selected_rows ();
for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) { for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) {
TreeIter iter = freesound_list->get_iter(*i); TreeIter iter = freesound_list->get_iter(*i);
ustring str = (*iter)[freesound_list_columns.pathname]; string str = (*iter)[freesound_list_columns.pathname];
results.push_back (str); results.push_back (str);
} }
@ -890,7 +890,7 @@ SoundFileOmega::reset_options_noret ()
bool bool
SoundFileOmega::reset_options () SoundFileOmega::reset_options ()
{ {
vector<ustring> paths = get_paths (); vector<string> paths = get_paths ();
if (paths.empty()) { if (paths.empty()) {
@ -930,7 +930,7 @@ SoundFileOmega::reset_options ()
return false; return false;
} }
ustring existing_choice; string existing_choice;
vector<string> action_strings; vector<string> action_strings;
if (selected_track_cnt > 0) { if (selected_track_cnt > 0) {
@ -1096,7 +1096,7 @@ SoundFileOmega::bad_file_message()
} }
bool bool
SoundFileOmega::check_info (const vector<ustring>& paths, bool& same_size, bool& src_needed, bool& multichannel) SoundFileOmega::check_info (const vector<string>& paths, bool& same_size, bool& src_needed, bool& multichannel)
{ {
SoundFileInfo info; SoundFileInfo info;
nframes64_t sz = 0; nframes64_t sz = 0;
@ -1107,7 +1107,7 @@ SoundFileOmega::check_info (const vector<ustring>& paths, bool& same_size, bool&
src_needed = false; src_needed = false;
multichannel = false; multichannel = false;
for (vector<ustring>::const_iterator i = paths.begin(); i != paths.end(); ++i) { for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
if (AudioFileSource::get_soundfile_info (*i, info, errmsg)) { if (AudioFileSource::get_soundfile_info (*i, info, errmsg)) {
if (info.channels > 1) { if (info.channels > 1) {
@ -1147,7 +1147,7 @@ SoundFileOmega::check_info (const vector<ustring>& paths, bool& same_size, bool&
bool bool
SoundFileOmega::check_link_status (const Session* s, const vector<ustring>& paths) SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths)
{ {
sys::path path = s->session_directory().sound_path() / "linktest"; sys::path path = s->session_directory().sound_path() / "linktest";
string tmpdir = path.to_string(); string tmpdir = path.to_string();
@ -1159,7 +1159,7 @@ SoundFileOmega::check_link_status (const Session* s, const vector<ustring>& path
} }
} }
for (vector<ustring>::const_iterator i = paths.begin(); i != paths.end(); ++i) { for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
char tmpc[MAXPATHLEN+1]; char tmpc[MAXPATHLEN+1];
@ -1200,19 +1200,19 @@ SoundFileChooser::on_hide ()
} }
} }
ustring string
SoundFileChooser::get_filename () SoundFileChooser::get_filename ()
{ {
vector<ustring> paths; vector<string> paths;
paths = get_paths (); paths = get_paths ();
if (paths.empty()) { if (paths.empty()) {
return ustring (); return string ();
} }
if (!Glib::file_test (paths.front(), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) { if (!Glib::file_test (paths.front(), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
return ustring(); return string();
} }
return paths.front(); return paths.front();
@ -1335,15 +1335,15 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi
/* setup disposition map */ /* setup disposition map */
disposition_map.insert (pair<ustring,ImportDisposition>(_("one track per file"), ImportDistinctFiles)); disposition_map.insert (pair<string,ImportDisposition>(_("one track per file"), ImportDistinctFiles));
disposition_map.insert (pair<ustring,ImportDisposition>(_("one track per channel"), ImportDistinctChannels)); disposition_map.insert (pair<string,ImportDisposition>(_("one track per channel"), ImportDistinctChannels));
disposition_map.insert (pair<ustring,ImportDisposition>(_("merge files"), ImportMergeFiles)); disposition_map.insert (pair<string,ImportDisposition>(_("merge files"), ImportMergeFiles));
disposition_map.insert (pair<ustring,ImportDisposition>(_("sequence files"), ImportSerializeFiles)); disposition_map.insert (pair<string,ImportDisposition>(_("sequence files"), ImportSerializeFiles));
disposition_map.insert (pair<ustring,ImportDisposition>(_("one region per file"), ImportDistinctFiles)); disposition_map.insert (pair<string,ImportDisposition>(_("one region per file"), ImportDistinctFiles));
disposition_map.insert (pair<ustring,ImportDisposition>(_("one region per channel"), ImportDistinctChannels)); disposition_map.insert (pair<string,ImportDisposition>(_("one region per channel"), ImportDistinctChannels));
disposition_map.insert (pair<ustring,ImportDisposition>(_("all files in one region"), ImportMergeFiles)); disposition_map.insert (pair<string,ImportDisposition>(_("all files in one region"), ImportMergeFiles));
disposition_map.insert (pair<ustring,ImportDisposition>(_("all files in one track"), ImportMergeFiles)); disposition_map.insert (pair<string,ImportDisposition>(_("all files in one track"), ImportMergeFiles));
chooser.signal_selection_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::file_selection_changed)); chooser.signal_selection_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::file_selection_changed));
@ -1391,7 +1391,7 @@ SoundFileOmega::on_hide ()
ImportPosition ImportPosition
SoundFileOmega::get_position() const SoundFileOmega::get_position() const
{ {
ustring str = where_combo.get_active_text(); string str = where_combo.get_active_text();
if (str == _("file timestamp")) { if (str == _("file timestamp")) {
return ImportAtTimestamp; return ImportAtTimestamp;
@ -1407,7 +1407,7 @@ SoundFileOmega::get_position() const
SrcQuality SrcQuality
SoundFileOmega::get_src_quality() const SoundFileOmega::get_src_quality() const
{ {
ustring str = where_combo.get_active_text(); string str = where_combo.get_active_text();
if (str == _("Best")) { if (str == _("Best")) {
return SrcBest; return SrcBest;
@ -1430,7 +1430,7 @@ SoundFileOmega::get_channel_disposition () const
and the ImportDisposition enum that corresponds to it. and the ImportDisposition enum that corresponds to it.
*/ */
ustring str = channel_combo.get_active_text(); string str = channel_combo.get_active_text();
DispositionMap::const_iterator x = disposition_map.find (str); DispositionMap::const_iterator x = disposition_map.find (str);
if (x == disposition_map.end()) { if (x == disposition_map.end()) {

19
gtk2_ardour/sfdb_ui.h
View file

@ -23,7 +23,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <map> #include <map>
#include <glibmm/ustring.h>
#include <sigc++/signal.h> #include <sigc++/signal.h>
@ -58,14 +57,14 @@ class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr
virtual ~SoundFileBox () {}; virtual ~SoundFileBox () {};
void set_session (ARDOUR::Session* s); void set_session (ARDOUR::Session* s);
bool setup_labels (const Glib::ustring& filename); bool setup_labels (const std::string& filename);
void audition(); void audition();
bool audition_oneshot(); bool audition_oneshot();
bool autoplay () const; bool autoplay () const;
protected: protected:
Glib::ustring path; std::string path;
ARDOUR::SoundFileInfo sf_info; ARDOUR::SoundFileInfo sf_info;
@ -110,7 +109,7 @@ class SoundFileBrowser : public ArdourDialog
class FoundTagColumns : public Gtk::TreeModel::ColumnRecord class FoundTagColumns : public Gtk::TreeModel::ColumnRecord
{ {
public: public:
Gtk::TreeModelColumn<Glib::ustring> pathname; Gtk::TreeModelColumn<std::string> pathname;
FoundTagColumns() { add(pathname); } FoundTagColumns() { add(pathname); }
}; };
@ -126,7 +125,7 @@ class SoundFileBrowser : public ArdourDialog
virtual ~SoundFileBrowser (); virtual ~SoundFileBrowser ();
virtual void set_session (ARDOUR::Session*); virtual void set_session (ARDOUR::Session*);
std::vector<Glib::ustring> get_paths (); std::vector<std::string> get_paths ();
void clear_selection (); void clear_selection ();
@ -155,7 +154,7 @@ class SoundFileBrowser : public ArdourDialog
Gtk::FileFilter matchall_filter; Gtk::FileFilter matchall_filter;
Gtk::HBox hpacker; Gtk::HBox hpacker;
static Glib::ustring persistent_folder; static std::string persistent_folder;
Gtk::Notebook notebook; Gtk::Notebook notebook;
@ -196,7 +195,7 @@ class SoundFileChooser : public SoundFileBrowser
SoundFileChooser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s = 0); SoundFileChooser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s = 0);
virtual ~SoundFileChooser () {}; virtual ~SoundFileChooser () {};
Glib::ustring get_filename (); std::string get_filename ();
protected: protected:
void on_hide(); void on_hide();
@ -230,7 +229,7 @@ class SoundFileOmega : public SoundFileBrowser
private: private:
uint32_t selected_track_cnt; uint32_t selected_track_cnt;
typedef std::map<Glib::ustring,Editing::ImportDisposition> DispositionMap; typedef std::map<std::string,Editing::ImportDisposition> DispositionMap;
DispositionMap disposition_map; DispositionMap disposition_map;
Gtk::HBox options; Gtk::HBox options;
@ -238,10 +237,10 @@ class SoundFileOmega : public SoundFileBrowser
Gtk::VBox block_three; Gtk::VBox block_three;
Gtk::VBox block_four; Gtk::VBox block_four;
bool check_info (const std::vector<Glib::ustring>& paths, bool check_info (const std::vector<std::string>& paths,
bool& same_size, bool& src_needed, bool& multichannel); bool& same_size, bool& src_needed, bool& multichannel);
static bool check_link_status (const ARDOUR::Session*, const std::vector<Glib::ustring>& paths); static bool check_link_status (const ARDOUR::Session*, const std::vector<std::string>& paths);
void file_selection_changed (); void file_selection_changed ();
bool reset_options (); bool reset_options ();

10
gtk2_ardour/startup.cc
View file

@ -180,7 +180,7 @@ ArdourStartup::use_session_template ()
} }
} }
Glib::ustring std::string
ArdourStartup::session_template_name () ArdourStartup::session_template_name ()
{ {
if (!load_template_override.empty()) { if (!load_template_override.empty()) {
@ -189,7 +189,7 @@ ArdourStartup::session_template_name ()
} }
if (ic_existing_session_button.get_active()) { if (ic_existing_session_button.get_active()) {
return ustring(); return string();
} }
if (use_template_button.get_active()) { if (use_template_button.get_active()) {
@ -203,7 +203,7 @@ ArdourStartup::session_template_name ()
} }
} }
Glib::ustring std::string
ArdourStartup::session_name (bool& should_be_new) ArdourStartup::session_name (bool& should_be_new)
{ {
if (ic_new_session_button.get_active()) { if (ic_new_session_button.get_active()) {
@ -229,11 +229,11 @@ ArdourStartup::session_name (bool& should_be_new)
} }
} }
Glib::ustring std::string
ArdourStartup::session_folder () ArdourStartup::session_folder ()
{ {
if (ic_new_session_button.get_active()) { if (ic_new_session_button.get_active()) {
Glib::ustring legal_session_folder_name = legalize_for_path (new_name_entry.get_text()); std::string legal_session_folder_name = legalize_for_path (new_name_entry.get_text());
return Glib::build_filename (new_folder_chooser.get_current_folder(), legal_session_folder_name); return Glib::build_filename (new_folder_chooser.get_current_folder(), legal_session_folder_name);
} else if (_existing_session_chooser_used) { } else if (_existing_session_chooser_used) {
/* existing session chosen from file chooser */ /* existing session chosen from file chooser */

10
gtk2_ardour/startup.h
View file

@ -51,11 +51,11 @@ class ArdourStartup : public Gtk::Assistant {
void set_new_only (bool); void set_new_only (bool);
void set_load_template( std::string load_template ); void set_load_template( std::string load_template );
Glib::ustring session_name (bool& should_be_new); std::string session_name (bool& should_be_new);
Glib::ustring session_folder (); std::string session_folder ();
bool use_session_template(); bool use_session_template();
Glib::ustring session_template_name(); std::string session_template_name();
EngineControl* engine_control() { return engine_dialog; } EngineControl* engine_control() { return engine_dialog; }
@ -153,8 +153,8 @@ class ArdourStartup : public Gtk::Assistant {
add (visible_name); add (visible_name);
add (fullpath); add (fullpath);
} }
Gtk::TreeModelColumn<Glib::ustring> visible_name; Gtk::TreeModelColumn<std::string> visible_name;
Gtk::TreeModelColumn<Glib::ustring> fullpath; Gtk::TreeModelColumn<std::string> fullpath;
}; };
RecentSessionModelColumns recent_session_columns; RecentSessionModelColumns recent_session_columns;

4
gtk2_ardour/theme_manager.h
View file

@ -53,8 +53,8 @@ class ThemeManager : public ArdourDialog
add (rgba); add (rgba);
} }
Gtk::TreeModelColumn<Glib::ustring> name; Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<Glib::ustring> color; Gtk::TreeModelColumn<std::string> color;
Gtk::TreeModelColumn<Gdk::Color> gdkcolor; Gtk::TreeModelColumn<Gdk::Color> gdkcolor;
Gtk::TreeModelColumn<UIConfigVariable<uint32_t> *> pVar; Gtk::TreeModelColumn<UIConfigVariable<uint32_t> *> pVar;
Gtk::TreeModelColumn<uint32_t> rgba; Gtk::TreeModelColumn<uint32_t> rgba;

6
gtk2_ardour/time_axis_view_item.cc
View file

@ -485,7 +485,7 @@ TimeAxisViewItem::get_time_axis_view () const
*/ */
void void
TimeAxisViewItem::set_name_text(const ustring& new_name) TimeAxisViewItem::set_name_text(const string& new_name)
{ {
if (!name_pixbuf) { if (!name_pixbuf) {
return; return;
@ -493,7 +493,7 @@ TimeAxisViewItem::set_name_text(const ustring& new_name)
last_item_width = trackview.editor().frame_to_pixel(item_duration); last_item_width = trackview.editor().frame_to_pixel(item_duration);
name_pixbuf_width = pixel_width (new_name, *NAME_FONT) + 2; name_pixbuf_width = pixel_width (new_name, *NAME_FONT) + 2;
name_pixbuf->property_pixbuf() = pixbuf_from_ustring(new_name, NAME_FONT, name_pixbuf_width, NAME_HEIGHT, Gdk::Color ("#000000")); name_pixbuf->property_pixbuf() = pixbuf_from_string(new_name, NAME_FONT, name_pixbuf_width, NAME_HEIGHT, Gdk::Color ("#000000"));
} }
@ -862,7 +862,7 @@ TimeAxisViewItem::reset_name_width (double /*pixel_width*/)
update_name_pixbuf_visibility (); update_name_pixbuf_visibility ();
if (pb_width > 0) { if (pb_width > 0) {
name_pixbuf->property_pixbuf() = pixbuf_from_ustring(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000")); name_pixbuf->property_pixbuf() = pixbuf_from_string(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000"));
} }
} }

2
gtk2_ardour/time_axis_view_item.h
View file

@ -62,7 +62,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
void set_sensitive (bool yn) { _sensitive = yn; } void set_sensitive (bool yn) { _sensitive = yn; }
bool sensitive () const { return _sensitive; } bool sensitive () const { return _sensitive; }
TimeAxisView& get_time_axis_view () const; TimeAxisView& get_time_axis_view () const;
void set_name_text(const Glib::ustring&); void set_name_text(const std::string&);
virtual void set_height(double h); virtual void set_height(double h);
void set_y (double); void set_y (double);
void set_color (Gdk::Color const &); void set_color (Gdk::Color const &);

18
gtk2_ardour/utils.cc
View file

@ -58,7 +58,7 @@ using Gtkmm2ext::Keyboard;
sigc::signal<void> DPIReset; sigc::signal<void> DPIReset;
int int
pixel_width (const ustring& str, Pango::FontDescription& font) pixel_width (const string& str, Pango::FontDescription& font)
{ {
Label foo; Label foo;
Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (""); Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout ("");
@ -71,20 +71,20 @@ pixel_width (const ustring& str, Pango::FontDescription& font)
return width; return width;
} }
ustring string
fit_to_pixels (const ustring& str, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses) fit_to_pixels (const string& str, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses)
{ {
Label foo; Label foo;
Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (""); Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout ("");
ustring::size_type shorter_by = 0; string::size_type shorter_by = 0;
ustring txt; string txt;
layout->set_font_description (font); layout->set_font_description (font);
actual_width = 0; actual_width = 0;
ustring ustr = str; string ustr = str;
ustring::iterator last = ustr.end(); string::iterator last = ustr.end();
--last; /* now points at final entry */ --last; /* now points at final entry */
txt = ustr; txt = ustr;
@ -780,7 +780,7 @@ get_xpm (std::string name)
return xpm_map[name]; return xpm_map[name];
} }
Glib::ustring std::string
get_icon_path (const char* cname) get_icon_path (const char* cname)
{ {
string name = cname; string name = cname;
@ -964,7 +964,7 @@ resize_window_to_proportion_of_monitor (Gtk::Window* window, int max_width, int
} }
Glib::RefPtr<Gdk::Pixbuf> Glib::RefPtr<Gdk::Pixbuf>
pixbuf_from_ustring(const ustring& name, Pango::FontDescription* font, int clip_width, int clip_height, Gdk::Color fg) pixbuf_from_string(const string& name, Pango::FontDescription* font, int clip_width, int clip_height, Gdk::Color fg)
{ {
static Glib::RefPtr<Gdk::Pixbuf>* empty_pixbuf = 0; static Glib::RefPtr<Gdk::Pixbuf>* empty_pixbuf = 0;

17
gtk2_ardour/utils.h
View file

@ -26,7 +26,6 @@
#include "ardour/types.h" #include "ardour/types.h"
#include <libgnomecanvasmm/line.h> #include <libgnomecanvasmm/line.h>
#include <gdkmm/types.h> #include <gdkmm/types.h>
#include <glibmm/ustring.h>
#include <gtkmm/menushell.h> #include <gtkmm/menushell.h>
#include "canvas.h" #include "canvas.h"
@ -43,11 +42,11 @@ namespace Gtk {
class Adjustment; class Adjustment;
} }
Glib::ustring fit_to_pixels (const Glib::ustring&, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses = false); std::string fit_to_pixels (const std::string&, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses = false);
std::pair<std::string, double> fit_to_pixels (cairo_t *, std::string, double); std::pair<std::string, double> fit_to_pixels (cairo_t *, std::string, double);
int pixel_width (const Glib::ustring& str, Pango::FontDescription& font); int pixel_width (const std::string& str, Pango::FontDescription& font);
gint just_hide_it (GdkEventAny*, Gtk::Window*); gint just_hide_it (GdkEventAny*, Gtk::Window*);
void allow_keyboard_focus (bool); void allow_keyboard_focus (bool);
@ -77,7 +76,7 @@ bool forward_key_press (GdkEventKey* ev);
bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev); bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev);
Glib::RefPtr<Gdk::Pixbuf> get_xpm (std::string); Glib::RefPtr<Gdk::Pixbuf> get_xpm (std::string);
Glib::ustring get_icon_path (const char*); std::string get_icon_path (const char*);
Glib::RefPtr<Gdk::Pixbuf> get_icon (const char*); Glib::RefPtr<Gdk::Pixbuf> get_icon (const char*);
static std::map<std::string, Glib::RefPtr<Gdk::Pixbuf> > xpm_map; static std::map<std::string, Glib::RefPtr<Gdk::Pixbuf> > xpm_map;
const char* const *get_xpm_data (std::string path); const char* const *get_xpm_data (std::string path);
@ -92,11 +91,11 @@ void convert_bgra_to_rgba (guint8 const* src,
int width, int width,
int height); int height);
Glib::RefPtr<Gdk::Pixbuf> pixbuf_from_ustring (const Glib::ustring& name, Glib::RefPtr<Gdk::Pixbuf> pixbuf_from_string (const std::string& name,
Pango::FontDescription* font, Pango::FontDescription* font,
int clip_width, int clip_width,
int clip_height, int clip_height,
Gdk::Color); Gdk::Color);
void resize_window_to_proportion_of_monitor (Gtk::Window*, int, int); void resize_window_to_proportion_of_monitor (Gtk::Window*, int, int);