smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +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

64
gtk2_ardour/sfdb_ui.cc
View file

@ -73,9 +73,9 @@ using namespace Gtk;
using namespace Gtkmm2ext;
using namespace Editing;
using Glib::ustring;
using std::string;
ustring SoundFileBrowser::persistent_folder;
string SoundFileBrowser::persistent_folder;
static ImportMode
string2importmode (string str)
@ -213,7 +213,7 @@ SoundFileBox::set_session(Session* s)
}
bool
SoundFileBox::setup_labels (const ustring& filename)
SoundFileBox::setup_labels (const string& filename)
{
if (!path.empty()) {
// save existing tags
@ -682,7 +682,7 @@ SoundFileBrowser::found_list_view_selected ()
if (!reset_options ()) {
set_response_sensitive (RESPONSE_OK, false);
} else {
ustring file;
string file;
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 ()) {
set_response_sensitive (RESPONSE_OK, false);
} else {
ustring file;
string file;
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 ()
{
vector<ustring> results;
vector<string> results;
int n = notebook.get_current_page ();
if (n == 0) {
vector<ustring> filenames = chooser.get_filenames();
vector<ustring>::iterator i;
vector<string> filenames = chooser.get_filenames();
vector<string>::iterator i;
for (i = filenames.begin(); i != filenames.end(); ++i) {
struct stat buf;
@ -859,7 +859,7 @@ SoundFileBrowser::get_paths ()
ListPath rows = found_list_view.get_selection()->get_selected_rows ();
for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++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);
}
@ -870,7 +870,7 @@ SoundFileBrowser::get_paths ()
ListPath rows = freesound_list_view.get_selection()->get_selected_rows ();
for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++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);
}
@ -890,7 +890,7 @@ SoundFileOmega::reset_options_noret ()
bool
SoundFileOmega::reset_options ()
{
vector<ustring> paths = get_paths ();
vector<string> paths = get_paths ();
if (paths.empty()) {
@ -930,7 +930,7 @@ SoundFileOmega::reset_options ()
return false;
}
ustring existing_choice;
string existing_choice;
vector<string> action_strings;
if (selected_track_cnt > 0) {
@ -1096,7 +1096,7 @@ SoundFileOmega::bad_file_message()
}
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;
nframes64_t sz = 0;
@ -1107,7 +1107,7 @@ SoundFileOmega::check_info (const vector<ustring>& paths, bool& same_size, bool&
src_needed = 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 (info.channels > 1) {
@ -1147,7 +1147,7 @@ SoundFileOmega::check_info (const vector<ustring>& paths, bool& same_size, 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";
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];
@ -1200,19 +1200,19 @@ SoundFileChooser::on_hide ()
}
}
ustring
string
SoundFileChooser::get_filename ()
{
vector<ustring> paths;
vector<string> paths;
paths = get_paths ();
if (paths.empty()) {
return ustring ();
return string ();
}
if (!Glib::file_test (paths.front(), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
return ustring();
return string();
}
return paths.front();
@ -1335,15 +1335,15 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi
/* setup disposition map */
disposition_map.insert (pair<ustring,ImportDisposition>(_("one track per file"), ImportDistinctFiles));
disposition_map.insert (pair<ustring,ImportDisposition>(_("one track per channel"), ImportDistinctChannels));
disposition_map.insert (pair<ustring,ImportDisposition>(_("merge files"), ImportMergeFiles));
disposition_map.insert (pair<ustring,ImportDisposition>(_("sequence files"), ImportSerializeFiles));
disposition_map.insert (pair<string,ImportDisposition>(_("one track per file"), ImportDistinctFiles));
disposition_map.insert (pair<string,ImportDisposition>(_("one track per channel"), ImportDistinctChannels));
disposition_map.insert (pair<string,ImportDisposition>(_("merge files"), ImportMergeFiles));
disposition_map.insert (pair<string,ImportDisposition>(_("sequence files"), ImportSerializeFiles));
disposition_map.insert (pair<ustring,ImportDisposition>(_("one region per file"), ImportDistinctFiles));
disposition_map.insert (pair<ustring,ImportDisposition>(_("one region per channel"), ImportDistinctChannels));
disposition_map.insert (pair<ustring,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>(_("one region per file"), ImportDistinctFiles));
disposition_map.insert (pair<string,ImportDisposition>(_("one region per channel"), ImportDistinctChannels));
disposition_map.insert (pair<string,ImportDisposition>(_("all files in one region"), 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));
@ -1391,7 +1391,7 @@ SoundFileOmega::on_hide ()
ImportPosition
SoundFileOmega::get_position() const
{
ustring str = where_combo.get_active_text();
string str = where_combo.get_active_text();
if (str == _("file timestamp")) {
return ImportAtTimestamp;
@ -1407,7 +1407,7 @@ SoundFileOmega::get_position() const
SrcQuality
SoundFileOmega::get_src_quality() const
{
ustring str = where_combo.get_active_text();
string str = where_combo.get_active_text();
if (str == _("Best")) {
return SrcBest;
@ -1430,7 +1430,7 @@ SoundFileOmega::get_channel_disposition () const
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);
if (x == disposition_map.end()) {