*/
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
#include <map>
#include <cerrno>
#include <sstream>
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)
}
warning << string_compose (_("programming error: unknown import mode string %1"), str) << endmsg;
-
+
return ImportAsTrack;
}
}
SoundFileBox::SoundFileBox (bool persistent)
- : _session(0),
- table (6, 2),
- length_clock ("sfboxLengthClock", !persistent, "EditCursorClock", false, true, false),
- timecode_clock ("sfboxTimecodeClock", !persistent, "EditCursorClock", false, false, false),
+ : table (6, 2),
+ length_clock ("sfboxLengthClock", !persistent, "EditCursorClock", false, false, true, false),
+ timecode_clock ("sfboxTimecodeClock", !persistent, "EditCursorClock", false, false, false, false),
main_box (false, 6),
autoplay_btn (_("Auto-play"))
-
+
{
set_name (X_("SoundFileBox"));
set_size_request (300, -1);
samplerate.set_text (_("Sample rate:"));
samplerate.set_alignment (1, 0.5);
- format_text.set_max_width_chars (8);
+ preview_label.set_max_width_chars (50);
+ preview_label.set_ellipsize (Pango::ELLIPSIZE_END);
+
+ format_text.set_max_width_chars (20);
format_text.set_ellipsize (Pango::ELLIPSIZE_END);
format_text.set_alignment (0, 1);
table.attach (timecode_clock, 1, 2, 5, 6, FILL, FILL);
length_clock.set_mode (ARDOUR_UI::instance()->secondary_clock.mode());
- timecode_clock.set_mode (AudioClock::SMPTE);
+ timecode_clock.set_mode (AudioClock::Timecode);
main_box.pack_start (table, false, false);
tags_entry.set_editable (true);
- tags_entry.signal_focus_out_event().connect (mem_fun (*this, &SoundFileBox::tags_entry_left));
+ tags_entry.signal_focus_out_event().connect (sigc::mem_fun (*this, &SoundFileBox::tags_entry_left));
Label* label = manage (new Label (_("Tags:")));
label->set_alignment (0.0f, 0.5f);
main_box.pack_start (tags_entry, true, true);
main_box.pack_start (bottom_box, false, false);
-
+
play_btn.set_image (*(manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_BUTTON))));
play_btn.set_label (_("Play"));
stop_btn.set_image (*(manage (new Image (Stock::MEDIA_STOP, ICON_SIZE_BUTTON))));
stop_btn.set_label (_("Stop"));
-
+
bottom_box.set_homogeneous (false);
bottom_box.set_spacing (6);
bottom_box.pack_start(play_btn, true, true);
bottom_box.pack_start(stop_btn, true, true);
bottom_box.pack_start(autoplay_btn, false, false);
- play_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::audition));
- stop_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::stop_audition));
+ play_btn.signal_clicked().connect (sigc::mem_fun (*this, &SoundFileBox::audition));
+ stop_btn.signal_clicked().connect (sigc::mem_fun (*this, &SoundFileBox::stop_audition));
channels_value.set_alignment (0.0f, 0.5f);
samplerate_value.set_alignment (0.0f, 0.5f);
void
SoundFileBox::set_session(Session* s)
{
- _session = s;
+ SessionHandlePtr::set_session (s);
+
+ length_clock.set_session (s);
+ timecode_clock.set_session (s);
if (!_session) {
play_btn.set_sensitive (false);
stop_btn.set_sensitive (false);
- }
-
-
- length_clock.set_session (s);
- timecode_clock.set_session (s);
+ }
}
bool
-SoundFileBox::setup_labels (const ustring& filename)
+SoundFileBox::setup_labels (const string& filename)
{
if (!path.empty()) {
// save existing tags
length_clock.set (0);
timecode_clock.set (0);
-
+
tags_entry.set_sensitive (false);
play_btn.set_sensitive (false);
-
+
return false;
}
samplerate.set_name ("NewSessionSR2Label");
}
- nframes_t const nfr = _session ? _session->nominal_frame_rate() : 25;
+ framecnt_t const nfr = _session ? _session->nominal_frame_rate() : 25;
double src_coef = (double) nfr / sf_info.samplerate;
length_clock.set (sf_info.length * src_coef + 0.5, true);
// this is a hack that is fixed in trunk, i think (august 26th, 2007)
vector<string> tags = Library->get_tags (string ("//") + filename);
-
+
stringstream tag_string;
for (vector<string>::iterator i = tags.begin(); i != tags.end(); ++i) {
if (i != tags.begin()) {
tag_string << *i;
}
tags_entry.get_buffer()->set_text (tag_string.str());
-
+
tags_entry.set_sensitive (true);
if (_session) {
play_btn.set_sensitive (true);
}
-
+
return true;
}
if (!_session) {
return;
}
-
+
+ if (SMFSource::safe_midi_file_extension (path)) {
+ error << _("Auditioning of MIDI files is not yet supported") << endmsg;
+ return;
+ }
+
_session->cancel_audition();
if (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)) {
try {
afs = boost::dynamic_pointer_cast<AudioFileSource> (
SourceFactory::createReadable (DataType::AUDIO, *_session,
- path, false, n, Source::Flag (0), false));
-
+ path, n, Source::Flag (0), false));
+
srclist.push_back(afs);
-
+
} catch (failed_constructor& err) {
error << _("Could not access soundfile: ") << path << endmsg;
AudioSource::set_build_peakfiles (old_sbp);
}
AudioSource::set_build_peakfiles (old_sbp);
-
+
if (srclist.empty()) {
return;
}
-
+
afs = boost::dynamic_pointer_cast<AudioFileSource> (srclist[0]);
string rname = region_name_from_path (afs->path(), false);
- r = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (srclist, 0,
- srclist[0]->length(srclist[0]->timeline_position()),
- rname, 0, Region::DefaultFlags, false));
+
+ PropertyList plist;
+
+ plist.add (ARDOUR::Properties::start, 0);
+ plist.add (ARDOUR::Properties::length, srclist[0]->length(srclist[0]->timeline_position()));
+ plist.add (ARDOUR::Properties::name, rname);
+ plist.add (ARDOUR::Properties::layer, 0);
+
+ r = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (srclist, plist, false));
_session->audition_region(r);
}
}
bool
-SoundFileBox::tags_entry_left (GdkEventFocus *ev)
+SoundFileBox::tags_entry_left (GdkEventFocus *)
{
tags_changed ();
return false;
resetting_ourselves = false;
gm = 0;
- if (ARDOUR::Profile->get_sae()) {
- chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops");
- chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files");
- }
-
+#ifdef GTKOSX
+ chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops");
+ chooser.add_shortcut_folder_uri("file:///Library/Audio/Apple Loops");
+ chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files");
+
+ chooser.add_shortcut_folder_uri("file:///Volumes");
+#endif
//add the file chooser
{
chooser.set_border_width (12);
- audio_filter.add_custom (FILE_FILTER_FILENAME, mem_fun(*this, &SoundFileBrowser::on_audio_filter));
+ audio_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun(*this, &SoundFileBrowser::on_audio_filter));
audio_filter.set_name (_("Audio files"));
-
- midi_filter.add_custom (FILE_FILTER_FILENAME, mem_fun(*this, &SoundFileBrowser::on_midi_filter));
+
+ midi_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun(*this, &SoundFileBrowser::on_midi_filter));
midi_filter.set_name (_("MIDI files"));
-
+
matchall_filter.add_pattern ("*.*");
matchall_filter.set_name (_("All files"));
chooser.add_filter (midi_filter);
chooser.add_filter (matchall_filter);
chooser.set_select_multiple (true);
- chooser.signal_update_preview().connect(mem_fun(*this, &SoundFileBrowser::update_preview));
- chooser.signal_file_activated().connect (mem_fun (*this, &SoundFileBrowser::chooser_file_activated));
+ chooser.signal_update_preview().connect(sigc::mem_fun(*this, &SoundFileBrowser::update_preview));
+ chooser.signal_file_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::chooser_file_activated));
+#ifdef GTKOSX
+ /* some broken redraw behaviour - this is a bandaid */
+ chooser.signal_selection_changed().connect (mem_fun (chooser, &Widget::queue_draw));
+#endif
if (!persistent_folder.empty()) {
chooser.set_current_folder (persistent_folder);
}
notebook.append_page (chooser, _("Browse Files"));
}
-
+
hpacker.set_spacing (6);
hpacker.pack_start (notebook, true, true);
hpacker.pack_start (preview, false, false);
-
+
get_vbox()->pack_start (hpacker, true, true);
-
+
//add tag search
{
VBox* vbox;
hbox = manage(new HBox);
hbox->pack_start (found_entry);
hbox->pack_start (found_search_btn);
-
+
Gtk::ScrolledWindow *scroll = manage(new ScrolledWindow);
scroll->add(found_list_view);
scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
vbox = manage(new VBox);
vbox->pack_start (*hbox, PACK_SHRINK);
vbox->pack_start (*scroll);
-
+
found_list_view.append_column(_("Paths"), found_list_columns.pathname);
- found_list_view.get_selection()->signal_changed().connect(mem_fun(*this, &SoundFileBrowser::found_list_view_selected));
-
- found_list_view.signal_row_activated().connect (mem_fun (*this, &SoundFileBrowser::found_list_view_activated));
+ found_list_view.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_list_view_selected));
- found_search_btn.signal_clicked().connect(mem_fun(*this, &SoundFileBrowser::found_search_clicked));
- found_entry.signal_activate().connect(mem_fun(*this, &SoundFileBrowser::found_search_clicked));
+ found_list_view.signal_row_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::found_list_view_activated));
+
+ found_search_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_search_clicked));
+ found_entry.signal_activate().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_search_clicked));
notebook.append_page (*vbox, _("Search Tags"));
}
passbox->pack_start (*label, false, false);
passbox->pack_start (freesound_entry, false, false);
passbox->pack_start (freesound_search_btn, false, false);
-
+
Gtk::ScrolledWindow *scroll = manage(new ScrolledWindow);
scroll->add(freesound_list_view);
scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
vbox = manage(new VBox);
vbox->pack_start (*passbox, PACK_SHRINK);
vbox->pack_start(*scroll);
-
+
//vbox->pack_start (freesound_list_view);
freesound_list_view.append_column(_("Paths"), freesound_list_columns.pathname);
- freesound_list_view.get_selection()->signal_changed().connect(mem_fun(*this, &SoundFileBrowser::freesound_list_view_selected));
-
+ freesound_list_view.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_list_view_selected));
+
//freesound_list_view.get_selection()->set_mode (SELECTION_MULTIPLE);
- freesound_list_view.signal_row_activated().connect (mem_fun (*this, &SoundFileBrowser::freesound_list_view_activated));
- freesound_search_btn.signal_clicked().connect(mem_fun(*this, &SoundFileBrowser::freesound_search_clicked));
- freesound_entry.signal_activate().connect(mem_fun(*this, &SoundFileBrowser::freesound_search_clicked));
+ freesound_list_view.signal_row_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::freesound_list_view_activated));
+ freesound_search_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_search_clicked));
+ freesound_entry.signal_activate().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_search_clicked));
notebook.append_page (*vbox, _("Search Freesound"));
}
#endif
-
+
notebook.set_size_request (500, -1);
add_button (Stock::CANCEL, RESPONSE_CANCEL);
add_button (Stock::APPLY, RESPONSE_APPLY);
add_button (Stock::OK, RESPONSE_OK);
-
+
}
SoundFileBrowser::~SoundFileBrowser ()
}
void
-SoundFileBrowser::found_list_view_activated (const TreeModel::Path& path, TreeViewColumn* col)
+SoundFileBrowser::found_list_view_activated (const TreeModel::Path&, TreeViewColumn*)
{
preview.audition ();
}
void
-SoundFileBrowser::freesound_list_view_activated (const TreeModel::Path& path, TreeViewColumn* col)
+SoundFileBrowser::freesound_list_view_activated (const TreeModel::Path&, TreeViewColumn*)
{
preview.audition ();
}
{
ArdourDialog::set_session (s);
preview.set_session (s);
- if (s) {
+
+ if (_session) {
add_gain_meter ();
} else {
remove_gain_meter ();
{
delete gm;
- gm = new GainMeter (*session);
+ gm = new GainMeter (_session, 250);
- boost::shared_ptr<Route> r = session->the_auditioner ();
+ boost::shared_ptr<Route> r = _session->the_auditioner ();
- gm->set_controls (r, r->shared_peak_meter(), r->gain_control(), r->amp());
+ gm->set_controls (r, r->shared_peak_meter(), r->amp());
meter_packer.set_border_width (12);
meter_packer.pack_start (*gm, false, true);
void
SoundFileBrowser::start_metering ()
{
- metering_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun(*this, &SoundFileBrowser::meter));
+ metering_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (sigc::mem_fun(*this, &SoundFileBrowser::meter));
}
void
void
SoundFileBrowser::meter ()
{
- if (is_mapped () && session && gm) {
+ if (is_mapped () && _session && gm) {
gm->update_meters ();
}
}
{
if (preview.setup_labels (chooser.get_filename())) {
if (preview.autoplay()) {
- Glib::signal_idle().connect (mem_fun (preview, &SoundFileBox::audition_oneshot));
+ Glib::signal_idle().connect (sigc::mem_fun (preview, &SoundFileBox::audition_oneshot));
}
}
}
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 ();
-
+
if (!rows.empty()) {
TreeIter iter = found_list->get_iter(*rows.begin());
file = (*iter)[found_list_columns.pathname];
} else {
set_response_sensitive (RESPONSE_OK, false);
}
-
+
preview.setup_labels (file);
}
}
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 ();
-
+
if (!rows.empty()) {
TreeIter iter = freesound_list->get_iter(*rows.begin());
file = (*iter)[freesound_list_columns.pathname];
} else {
set_response_sensitive (RESPONSE_OK, false);
}
-
+
preview.setup_labels (file);
}
}
warning << _("SoundFileBrowser: Could not tokenize string: ") << tag_string << endmsg;
return;
}
-
+
vector<string> results;
Library->search_members_and (results, tags);
-
+
found_list->clear();
for (vector<string>::iterator i = results.begin(); i != results.end(); ++i) {
TreeModel::iterator new_row = found_list->append();
void*
freesound_search_thread_entry (void* arg)
{
- PBD::notify_gui_about_thread_creation (pthread_self(), X_("Freesound Search"));
+ SessionEvent::create_per_thread_pool ("freesound events", 64);
static_cast<SoundFileBrowser*>(arg)->freesound_search_thread ();
-
+
return 0;
}
{
if (canceling) //already canceling, button does nothing
return;
-
+
if ( searching ) {
freesound_search_btn.set_label(_("Cancelling.."));
canceling = true;
searching = true;
freesound_search_btn.set_label(_("Cancel"));
pthread_t freesound_thr;
- pthread_create_and_store ("freesound_search", &freesound_thr, 0, freesound_search_thread_entry, this);
+ pthread_create_and_store ("freesound_search", &freesound_thr, freesound_search_thread_entry, this);
}
}
void
SoundFileBrowser::freesound_search_thread()
{
+#if 0
+
+ THIS IS ALL TOTALLY THREAD-ILLEGAL ... YOU CANNOT DO GTK STUFF IN THIS THREAD
+
#ifdef FREESOUND
freesound_list->clear();
path = Glib::get_home_dir();
path += "/Freesound/";
Mootcher theMootcher(path.c_str());
-
+
string name_string = freesound_name_entry.get_text ();
string pass_string = freesound_pass_entry.get_text ();
string search_string = freesound_entry.get_text ();
TreeModel::iterator new_row = freesound_list->append();
TreeModel::Row row = *new_row;
string path = Glib::filename_from_uri (string ("file:") + filename);
- row[freesound_list_columns.pathname] = path;
+ row[freesound_list_columns.pathname] = path;
}
}
}
canceling = false;
freesound_search_btn.set_label(_("Start Downloading"));
#endif
+#endif
+
}
-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;
results.push_back (*i);
}
}
-
+
} else if (n==1){
-
+
typedef TreeView::Selection::ListHandle_Path ListPath;
-
+
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);
}
} else {
-
+
typedef TreeView::Selection::ListHandle_Path ListPath;
-
+
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);
}
}
bool
SoundFileOmega::reset_options ()
{
- vector<ustring> paths = get_paths ();
+ vector<string> paths = get_paths ();
if (paths.empty()) {
bool same_size;
bool src_needed;
bool selection_includes_multichannel;
- bool selection_can_be_embedded_with_links = check_link_status (*session, paths);
+ bool selection_can_be_embedded_with_links = check_link_status (_session, paths);
ImportMode mode;
if (check_info (paths, same_size, src_needed, selection_includes_multichannel)) {
- Glib::signal_idle().connect (mem_fun (*this, &SoundFileOmega::bad_file_message));
+ Glib::signal_idle().connect (sigc::mem_fun (*this, &SoundFileOmega::bad_file_message));
return false;
}
- ustring existing_choice;
+ string existing_choice;
vector<string> action_strings;
if (selected_track_cnt > 0) {
if (channel_combo.get_active_text().length()) {
ImportDisposition id = get_channel_disposition();
-
+
switch (id) {
case Editing::ImportDistinctFiles:
if (selected_track_cnt == paths.size()) {
action_strings.push_back (importmode2string (ImportToTrack));
}
break;
-
+
case Editing::ImportDistinctChannels:
/* XXX it would be nice to allow channel-per-selected track
- but its too hard we don't want to deal with all the
+ but its too hard we don't want to deal with all the
different per-file + per-track channel configurations.
*/
break;
-
+
default:
action_strings.push_back (importmode2string (ImportToTrack));
break;
}
- }
+ }
}
action_strings.push_back (importmode2string (ImportAsTrack));
}
vector<string> channel_strings;
-
+
if (mode == ImportAsTrack || mode == ImportAsTapeTrack || mode == ImportToTrack) {
channel_strings.push_back (_("one track per file"));
channel_strings.push_back (_("sequence files"));
}
if (same_size) {
- channel_strings.push_back (_("all files in one region"));
+ channel_strings.push_back (_("all files in one track"));
+ channel_strings.push_back (_("merge files"));
}
-
+
}
} else {
}
}
+ resetting_ourselves = true;
+
existing_choice = channel_combo.get_active_text();
set_popdown_strings (channel_combo, channel_strings);
channel_combo.set_active_text (channel_strings.front());
}
+ resetting_ourselves = false;
+
if (src_needed) {
src_combo.set_sensitive (true);
} else {
src_combo.set_sensitive (false);
}
-
+
if (Config->get_only_copy_imported_files()) {
if (selection_can_be_embedded_with_links) {
copy_files_btn.set_sensitive (true);
}
-
+
return true;
-}
+}
bool
SoundFileOmega::bad_file_message()
{
- MessageDialog msg (*this,
- _("One or more of the selected files\ncannot be used by Ardour"),
+ MessageDialog msg (*this,
+ string_compose (_("One or more of the selected files\ncannot be used by %1"), PROGRAM_NAME),
true,
Gtk::MESSAGE_INFO,
Gtk::BUTTONS_OK);
}
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;
+ framepos_t sz = 0;
bool err = false;
string errmsg;
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) {
}
}
- if ((nframes_t) info.samplerate != session->frame_rate()) {
+ if (info.samplerate != _session->frame_rate()) {
src_needed = true;
}
multichannel = true; // "channel" == track here...
}
- /* XXX we need err = true handling here in case
+ /* XXX we need err = true handling here in case
we can't check the file
*/
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();
bool ret = false;
return 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) {
char tmpc[MAXPATHLEN+1];
if (link ((*i).c_str(), tmpc)) {
goto out;
}
-
+
unlink (tmpc);
}
ArdourDialog::on_hide();
stop_metering ();
- if (session) {
- session->cancel_audition();
+ if (_session) {
+ _session->cancel_audition();
}
}
-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();
vector<string> str;
set_size_request (-1, 450);
-
+
block_two.set_border_width (12);
block_three.set_border_width (12);
block_four.set_border_width (12);
-
+
options.set_spacing (12);
str.clear ();
- str.push_back (_("use file timestamp"));
- str.push_back (_("at edit point"));
- str.push_back (_("at playhead"));
- str.push_back (_("at session start"));
+ str.push_back (_("file timestamp"));
+ str.push_back (_("edit point"));
+ str.push_back (_("playhead"));
+ str.push_back (_("session start"));
set_popdown_strings (where_combo, str);
where_combo.set_active_text (str.front());
Label* l = manage (new Label);
l->set_text (_("Add files:"));
-
+
hbox = manage (new HBox);
hbox->set_border_width (12);
hbox->set_spacing (6);
vbox->pack_start (*hbox, false, false);
options.pack_start (*vbox, false, false);
- /* dummy entry for action combo so that it doesn't look odd if we
+ /* dummy entry for action combo so that it doesn't look odd if we
come up with no tracks selected.
*/
action_combo.set_sensitive (false);
l = manage (new Label);
- l->set_text (_("Insert:"));
+ l->set_text (_("Insert at:"));
hbox = manage (new HBox);
hbox->set_border_width (12);
reset_options ();
- action_combo.signal_changed().connect (mem_fun (*this, &SoundFileOmega::reset_options_noret));
-
+ action_combo.signal_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::reset_options_noret));
+ channel_combo.signal_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::reset_options_noret));
+
copy_files_btn.set_active (true);
block_four.pack_start (copy_files_btn, false, false);
/* 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<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));
-
- chooser.signal_selection_changed().connect (mem_fun (*this, &SoundFileOmega::file_selection_changed));
+ 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<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));
+
+ /* set size requests for a couple of combos to allow them to display the longest text
+ they will ever be asked to display. This prevents them being resized when the user
+ selects a file to import, which in turn prevents the size of the dialog from jumping
+ around. */
+
+ vector<string> t;
+ t.push_back (_("one track per file"));
+ t.push_back (_("one track per channel"));
+ t.push_back (_("sequence files"));
+ t.push_back (_("all files in one region"));
+ set_size_request_to_display_given_text (channel_combo, t, COMBO_FUDGE + 10, 15);
+
+ t.clear ();
+ t.push_back (importmode2string (ImportAsTrack));
+ t.push_back (importmode2string (ImportToTrack));
+ t.push_back (importmode2string (ImportAsRegion));
+ t.push_back (importmode2string (ImportAsTapeTrack));
+ set_size_request_to_display_given_text (action_combo, t, COMBO_FUDGE + 10, 15);
}
void
SoundFileOmega::on_hide ()
{
ArdourDialog::on_hide();
- if (session) {
- session->cancel_audition();
+ if (_session) {
+ _session->cancel_audition();
}
}
ImportPosition
SoundFileOmega::get_position() const
{
- ustring str = where_combo.get_active_text();
+ string str = where_combo.get_active_text();
- if (str == _("use file timestamp")) {
+ if (str == _("file timestamp")) {
return ImportAtTimestamp;
- } else if (str == _("at edit point")) {
+ } else if (str == _("edit point")) {
return ImportAtEditPoint;
- } else if (str == _("at playhead")) {
+ } else if (str == _("playhead")) {
return ImportAtPlayhead;
} else {
return ImportAtStart;
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;
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()) {
{
selected_track_cnt = selected_tracks;
reset_options ();
-}
+}
void
SoundFileOmega::file_selection_changed ()
projects / ardour.git / blobdiff