X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fsfdb_ui.cc;h=f18831b404ab618963df9a2d119c0c46eb7fa5fa;hb=90619f4b9869ceccb29965e916ec07fe197b86da;hp=d4c294ae29aa013caa2d5c5fb55507aa79bd0f34;hpb=fa5aeb7892fb73d45782b42da731bc5a51418e79;p=ardour.git diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index d4c294ae29..f18831b404 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -17,6 +17,10 @@ */ +#ifdef WAF_BUILD +#include "gtk2ardour-config.h" +#endif + #include #include #include @@ -73,9 +77,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) @@ -113,10 +117,9 @@ importmode2string (ImportMode mode) } 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, "", false, false, true, false), + timecode_clock ("sfboxTimecodeClock", !persistent, "", false, false, false, false), main_box (false, 6), autoplay_btn (_("Auto-play")) @@ -145,7 +148,10 @@ SoundFileBox::SoundFileBox (bool persistent) 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); @@ -165,13 +171,13 @@ SoundFileBox::SoundFileBox (bool persistent) table.attach (length_clock, 1, 2, 4, 5, FILL, FILL); table.attach (timecode_clock, 1, 2, 5, 6, FILL, FILL); - length_clock.set_mode (ARDOUR_UI::instance()->secondary_clock.mode()); + length_clock.set_mode (ARDOUR_UI::instance()->secondary_clock->mode()); 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); @@ -192,8 +198,8 @@ SoundFileBox::SoundFileBox (bool persistent) 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); @@ -202,20 +208,19 @@ SoundFileBox::SoundFileBox (bool persistent) 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 @@ -263,7 +268,7 @@ SoundFileBox::setup_labels (const ustring& filename) 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); @@ -310,6 +315,11 @@ SoundFileBox::audition () 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)) { @@ -330,7 +340,7 @@ SoundFileBox::audition () try { afs = boost::dynamic_pointer_cast ( SourceFactory::createReadable (DataType::AUDIO, *_session, - path, false, n, Source::Flag (0), false)); + path, n, Source::Flag (0), false)); srclist.push_back(afs); @@ -349,9 +359,15 @@ SoundFileBox::audition () afs = boost::dynamic_pointer_cast (srclist[0]); string rname = region_name_from_path (afs->path(), false); - r = boost::dynamic_pointer_cast (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 (RegionFactory::create (srclist, plist, false)); _session->audition_region(r); } @@ -405,7 +421,7 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S preview (persistent), found_search_btn (_("Search")), found_list_view (found_list), - freesound_search_btn (_("Start Downloading")), + freesound_search_btn (_("Search")), freesound_list_view (freesound_list) { resetting_ourselves = false; @@ -414,20 +430,22 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S 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 ("*.*"); @@ -437,8 +455,12 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S 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); @@ -472,12 +494,12 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S 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.get_selection()->signal_changed().connect(sigc::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.signal_row_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::found_list_view_activated)); - 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_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")); } @@ -494,36 +516,56 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S passbox->set_spacing (6); label = manage (new Label); - label->set_text (_("User:")); + label->set_text (_("Tags:")); passbox->pack_start (*label, false, false); - passbox->pack_start (freesound_name_entry); + passbox->pack_start (freesound_entry, false, false); + label = manage (new Label); - label->set_text (_("Password:")); + label->set_text (_("Sort:")); passbox->pack_start (*label, false, false); - passbox->pack_start (freesound_pass_entry); + passbox->pack_start (freesound_sort, false, false); + freesound_sort.clear_items(); + + // Order of the following must correspond with enum sortMethod + // in sfdb_freesound_mootcher.h + freesound_sort.append_text(_("None")); + freesound_sort.append_text(_("Longest")); + freesound_sort.append_text(_("Shortest")); + freesound_sort.append_text(_("Newest")); + freesound_sort.append_text(_("Oldest")); + freesound_sort.append_text(_("Most downloaded")); + freesound_sort.append_text(_("Least downloaded")); + freesound_sort.append_text(_("Highest rated")); + freesound_sort.append_text(_("Lowest rated")); + freesound_sort.set_active(0); + label = manage (new Label); - label->set_text (_("Tags:")); + label->set_text (_("Page:")); passbox->pack_start (*label, false, false); - passbox->pack_start (freesound_entry, false, false); + passbox->pack_start (freesound_page, false, false); + freesound_page.set_range(1, 1000); + freesound_page.set_increments(1, 10); + passbox->pack_start (freesound_search_btn, false, false); - + passbox->pack_start (progress_bar); + 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); + vbox->pack_start (*scroll); - 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.append_column(_("ID") , freesound_list_columns.id); + freesound_list_view.append_column(_("Filename"), freesound_list_columns.filename); + freesound_list_view.append_column(_("URI") , freesound_list_columns.uri); + 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.get_selection()->set_mode (SELECTION_MULTIPLE); + 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 @@ -582,7 +624,8 @@ SoundFileBrowser::set_session (Session* s) { ArdourDialog::set_session (s); preview.set_session (s); - if (s) { + + if (_session) { add_gain_meter (); } else { remove_gain_meter (); @@ -594,9 +637,9 @@ SoundFileBrowser::add_gain_meter () { delete gm; - gm = new GainMeter (*session); + gm = new GainMeter (_session, 250); - boost::shared_ptr r = session->the_auditioner (); + boost::shared_ptr r = _session->the_auditioner (); gm->set_controls (r, r->shared_peak_meter(), r->amp()); @@ -621,7 +664,7 @@ SoundFileBrowser::remove_gain_meter () 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 @@ -633,7 +676,7 @@ SoundFileBrowser::stop_metering () void SoundFileBrowser::meter () { - if (is_mapped () && session && gm) { + if (is_mapped () && _session && gm) { gm->update_meters (); } } @@ -655,7 +698,7 @@ SoundFileBrowser::update_preview () { 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)); } } } @@ -666,7 +709,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 (); @@ -686,16 +729,37 @@ SoundFileBrowser::found_list_view_selected () void SoundFileBrowser::freesound_list_view_selected () { +#ifdef FREESOUND if (!reset_options ()) { set_response_sensitive (RESPONSE_OK, false); } else { - ustring file; + + string path; + path = Glib::get_home_dir(); + path += "/Freesound/"; + Mootcher theMootcher(path.c_str()); // XXX should be a member of SoundFileBrowser + + 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]; + + string id = (*iter)[freesound_list_columns.id]; + string uri = (*iter)[freesound_list_columns.uri]; + string ofn = (*iter)[freesound_list_columns.filename]; + + // download the sound file + GdkCursor *prev_cursor; + prev_cursor = gdk_window_get_cursor (get_window()->gobj()); + gdk_window_set_cursor (get_window()->gobj(), gdk_cursor_new(GDK_WATCH)); + gdk_flush(); + + file = theMootcher.getAudioFile(ofn, id, uri, &progress_bar); + + gdk_window_set_cursor (get_window()->gobj(), prev_cursor); + chooser.set_filename (file); set_response_sensitive (RESPONSE_OK, true); } else { @@ -704,6 +768,7 @@ SoundFileBrowser::freesound_list_view_selected () preview.setup_labels (file); } +#endif } void @@ -730,38 +795,15 @@ SoundFileBrowser::found_search_clicked () } } -void* -freesound_search_thread_entry (void* arg) -{ - PBD::notify_gui_about_thread_creation (pthread_self(), X_("Freesound Search")); - - static_cast(arg)->freesound_search_thread (); - - return 0; -} - -bool searching = false; -bool canceling = false; - void SoundFileBrowser::freesound_search_clicked () { - if (canceling) //already canceling, button does nothing - return; - - if ( searching ) { - freesound_search_btn.set_label(_("Cancelling..")); - canceling = true; - } else { - 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); - } + freesound_search(); } + void -SoundFileBrowser::freesound_search_thread() +SoundFileBrowser::freesound_search() { #ifdef FREESOUND freesound_list->clear(); @@ -771,57 +813,92 @@ SoundFileBrowser::freesound_search_thread() 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 (); + enum sortMethod sort_method = (enum sortMethod) freesound_sort.get_active_row_number(); + int page = freesound_page.get_value_as_int(); - if ( theMootcher.doLogin( name_string, pass_string ) ) { + GdkCursor *prev_cursor; + prev_cursor = gdk_window_get_cursor (get_window()->gobj()); + gdk_window_set_cursor (get_window()->gobj(), gdk_cursor_new(GDK_WATCH)); + gdk_flush(); - string theString = theMootcher.searchText(search_string); + string theString = theMootcher.searchText( + search_string, + page, + "", // filter, could do, e.g. "type:wav" + sort_method + ); - XMLTree doc; - doc.read_buffer( theString ); - XMLNode *root = doc.root(); + gdk_window_set_cursor (get_window()->gobj(), prev_cursor); - if (root==NULL) return; + XMLTree doc; + doc.read_buffer( theString ); + XMLNode *root = doc.root(); - if ( strcmp(root->name().c_str(), "freesound") == 0) { + if (!root) { + cerr << "no root XML node!" << endl; + return; + } - XMLNode *node = 0; - XMLNodeList children = root->children(); - XMLNodeConstIterator niter; - for (niter = children.begin(); niter != children.end() && !canceling; ++niter) { - node = *niter; - if( strcmp( node->name().c_str(), "sample") == 0 ){ - XMLProperty *prop=node->property ("id"); - string filename = theMootcher.getFile( prop->value().c_str() ); - if ( filename != "" ) { - 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; - } - } - } - } + if ( strcmp(root->name().c_str(), "response") != 0) { + cerr << "root node name == " << root->name() << ", != \"response\"!" << endl; + return; + } + + XMLNode *sounds_root = root->child("sounds"); + + if (!sounds_root) { + cerr << "no child node \"sounds\" found!" << endl; + return; } + + XMLNodeList sounds = sounds_root->children(); + XMLNodeConstIterator niter; + XMLNode *node; + for (niter = sounds.begin(); niter != sounds.end(); ++niter) { + node = *niter; + if( strcmp( node->name().c_str(), "resource") != 0 ){ + cerr << "node->name()=" << node->name() << ",!= \"resource\"!" << endl; + continue; // return; + } + + // node->dump(cerr, "node:"); + + XMLNode *id_node = node->child ("id"); + XMLNode *uri_node = node->child ("serve"); + XMLNode *ofn_node = node->child ("original_filename"); + + if (id_node && uri_node && ofn_node) { + + std::string id = id_node->child("text")->content(); + std::string uri = uri_node->child("text")->content(); + std::string ofn = ofn_node->child("text")->content(); + + std::string r; + // cerr << "id=" << id << ",uri=" << uri << ",ofn=" << ofn << endl; + + TreeModel::iterator new_row = freesound_list->append(); + TreeModel::Row row = *new_row; + + row[freesound_list_columns.id ] = id; + row[freesound_list_columns.uri ] = uri; + row[freesound_list_columns.filename] = ofn; - searching = false; - canceling = false; - freesound_search_btn.set_label(_("Start Downloading")); + } + } #endif } -vector +vector SoundFileBrowser::get_paths () { - vector results; + vector results; int n = notebook.get_current_page (); if (n == 0) { - vector filenames = chooser.get_filenames(); - vector::iterator i; + vector filenames = chooser.get_filenames(); + vector::iterator i; for (i = filenames.begin(); i != filenames.end(); ++i) { struct stat buf; @@ -837,21 +914,39 @@ 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); } } else { - +#ifdef FREESOUND typedef TreeView::Selection::ListHandle_Path ListPath; + string path; + path = Glib::get_home_dir(); + path += "/Freesound/"; + Mootcher theMootcher(path.c_str()); // XXX should be a member of SoundFileBrowser + + 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 id = (*iter)[freesound_list_columns.id]; + string uri = (*iter)[freesound_list_columns.uri]; + string ofn = (*iter)[freesound_list_columns.filename]; + + GdkCursor *prev_cursor; + prev_cursor = gdk_window_get_cursor (get_window()->gobj()); + gdk_window_set_cursor (get_window()->gobj(), gdk_cursor_new(GDK_WATCH)); + gdk_flush(); + string str = theMootcher.getAudioFile(ofn, id, uri, &progress_bar); results.push_back (str); + + gdk_window_set_cursor (get_window()->gobj(), prev_cursor); + } +#endif } return results; @@ -868,7 +963,7 @@ SoundFileOmega::reset_options_noret () bool SoundFileOmega::reset_options () { - vector paths = get_paths (); + vector paths = get_paths (); if (paths.empty()) { @@ -900,39 +995,52 @@ SoundFileOmega::reset_options () 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 action_strings; - if (selected_track_cnt > 0) { - if (channel_combo.get_active_text().length()) { - ImportDisposition id = get_channel_disposition(); + if (chooser.get_filter() == &audio_filter) { + + /* AUDIO */ - switch (id) { - case Editing::ImportDistinctFiles: - if (selected_track_cnt == paths.size()) { + if (selected_audio_track_cnt > 0) { + if (channel_combo.get_active_text().length()) { + ImportDisposition id = get_channel_disposition(); + + switch (id) { + case Editing::ImportDistinctFiles: + if (selected_audio_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 + different per-file + per-track channel configurations. + */ + break; + + default: action_strings.push_back (importmode2string (ImportToTrack)); + break; } - 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 - different per-file + per-track channel configurations. - */ - break; + } else { - default: - action_strings.push_back (importmode2string (ImportToTrack)); - break; - } + /* MIDI */ + + if (selected_midi_track_cnt > 0) { + action_strings.push_back (importmode2string (ImportToTrack)); } } @@ -989,7 +1097,8 @@ SoundFileOmega::reset_options () 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")); } } @@ -1008,6 +1117,8 @@ SoundFileOmega::reset_options () } } + resetting_ourselves = true; + existing_choice = channel_combo.get_active_text(); set_popdown_strings (channel_combo, channel_strings); @@ -1029,6 +1140,8 @@ SoundFileOmega::reset_options () channel_combo.set_active_text (channel_strings.front()); } + resetting_ourselves = false; + if (src_needed) { src_combo.set_sensitive (true); } else { @@ -1056,7 +1169,7 @@ bool SoundFileOmega::bad_file_message() { MessageDialog msg (*this, - _("One or more of the selected files\ncannot be used by Ardour"), + string_compose (_("One or more of the selected files\ncannot be used by %1"), PROGRAM_NAME), true, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK); @@ -1069,10 +1182,10 @@ SoundFileOmega::bad_file_message() } bool -SoundFileOmega::check_info (const vector& paths, bool& same_size, bool& src_needed, bool& multichannel) +SoundFileOmega::check_info (const vector& paths, bool& same_size, bool& src_needed, bool& multichannel) { SoundFileInfo info; - nframes64_t sz = 0; + framepos_t sz = 0; bool err = false; string errmsg; @@ -1080,7 +1193,7 @@ SoundFileOmega::check_info (const vector& paths, bool& same_size, bool& src_needed = false; multichannel = false; - for (vector::const_iterator i = paths.begin(); i != paths.end(); ++i) { + for (vector::const_iterator i = paths.begin(); i != paths.end(); ++i) { if (AudioFileSource::get_soundfile_info (*i, info, errmsg)) { if (info.channels > 1) { @@ -1094,7 +1207,7 @@ SoundFileOmega::check_info (const vector& paths, bool& same_size, bool& } } - if ((nframes_t) info.samplerate != session->frame_rate()) { + if (info.samplerate != _session->frame_rate()) { src_needed = true; } @@ -1120,9 +1233,9 @@ SoundFileOmega::check_info (const vector& paths, bool& same_size, bool& bool -SoundFileOmega::check_link_status (const Session& s, const vector& paths) +SoundFileOmega::check_link_status (const Session* s, const vector& 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; @@ -1132,7 +1245,7 @@ SoundFileOmega::check_link_status (const Session& s, const vector& path } } - for (vector::const_iterator i = paths.begin(); i != paths.end(); ++i) { + for (vector::const_iterator i = paths.begin(); i != paths.end(); ++i) { char tmpc[MAXPATHLEN+1]; @@ -1168,34 +1281,38 @@ SoundFileChooser::on_hide () ArdourDialog::on_hide(); stop_metering (); - if (session) { - session->cancel_audition(); + if (_session) { + _session->cancel_audition(); } } -ustring +string SoundFileChooser::get_filename () { - vector paths; + vector 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(); } -SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Session* s, int selected_tracks, bool persistent, +SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Session* s, + uint32_t selected_audio_tracks, + uint32_t selected_midi_tracks, + bool persistent, Editing::ImportMode mode_hint) - : SoundFileBrowser (parent, title, s, persistent), - copy_files_btn ( _("Copy files to session")), - selected_track_cnt (selected_tracks) + : SoundFileBrowser (parent, title, s, persistent) + , copy_files_btn ( _("Copy files to session")) + , selected_audio_track_cnt (selected_audio_tracks) + , selected_midi_track_cnt (selected_midi_tracks) { VBox* vbox; HBox* hbox; @@ -1295,7 +1412,8 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi 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); @@ -1307,16 +1425,17 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi /* setup disposition map */ - disposition_map.insert (pair(_("one track per file"), ImportDistinctFiles)); - disposition_map.insert (pair(_("one track per channel"), ImportDistinctChannels)); - disposition_map.insert (pair(_("merge files"), ImportMergeFiles)); - disposition_map.insert (pair(_("sequence files"), ImportSerializeFiles)); + disposition_map.insert (pair(_("one track per file"), ImportDistinctFiles)); + disposition_map.insert (pair(_("one track per channel"), ImportDistinctChannels)); + disposition_map.insert (pair(_("merge files"), ImportMergeFiles)); + disposition_map.insert (pair(_("sequence files"), ImportSerializeFiles)); - disposition_map.insert (pair(_("one region per file"), ImportDistinctFiles)); - disposition_map.insert (pair(_("one region per channel"), ImportDistinctChannels)); - disposition_map.insert (pair(_("all files in one region"), ImportMergeFiles)); + disposition_map.insert (pair(_("one region per file"), ImportDistinctFiles)); + disposition_map.insert (pair(_("one region per channel"), ImportDistinctChannels)); + disposition_map.insert (pair(_("all files in one region"), ImportMergeFiles)); + disposition_map.insert (pair(_("all files in one track"), ImportMergeFiles)); - chooser.signal_selection_changed().connect (mem_fun (*this, &SoundFileOmega::file_selection_changed)); + 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 @@ -1354,15 +1473,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 == _("file timestamp")) { return ImportAtTimestamp; @@ -1378,7 +1497,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; @@ -1401,7 +1520,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()) { @@ -1413,9 +1532,10 @@ SoundFileOmega::get_channel_disposition () const } void -SoundFileOmega::reset (int selected_tracks) +SoundFileOmega::reset (uint32_t selected_audio_tracks, uint32_t selected_midi_tracks) { - selected_track_cnt = selected_tracks; + selected_audio_track_cnt = selected_audio_tracks; + selected_midi_track_cnt = selected_midi_tracks; reset_options (); }