X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsfdb_ui.cc;h=8916a53971af270b666d9178ef853d904179d1dc;hb=8630fd1703acb2f9a36d6db7e0d18963b461614f;hp=3ac1dff2ab51e21a2115cb48355808f37bef81f7;hpb=92a2b8cb3fb1620b222162269b1e954a8bc32f48;p=ardour.git diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 3ac1dff2ab..8916a53971 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -62,6 +62,7 @@ #include "utils.h" #include "gain_meter.h" #include "main_clock.h" +#include "public_editor.h" #ifdef FREESOUND #include "sfdb_freesound_mootcher.h" @@ -339,9 +340,9 @@ SoundFileBox::audition () for (int n = 0; n < sf_info.channels; ++n) { try { afs = boost::dynamic_pointer_cast ( - SourceFactory::createReadable (DataType::AUDIO, *_session, - path, n, Source::Flag (0), false)); - + SourceFactory::createExternal (DataType::AUDIO, *_session, + path, n, Source::Flag (0), false)); + srclist.push_back(afs); } catch (failed_constructor& err) { @@ -413,205 +414,252 @@ SoundFileBox::save_tags (const vector& tags) Library->save_changes (); } -SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::Session* s, bool persistent) - : ArdourDialog (parent, title, false, false), - found_list (ListStore::create(found_list_columns)), - freesound_list (ListStore::create(freesound_list_columns)), - chooser (FILE_CHOOSER_ACTION_OPEN), - preview (persistent), - found_search_btn (_("Search")), - found_list_view (found_list), - freesound_search_btn (_("Search")), - freesound_list_view (freesound_list) +SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persistent) + : ArdourWindow (title) + , found_list (ListStore::create(found_list_columns)) + , freesound_list (ListStore::create(freesound_list_columns)) + , chooser (FILE_CHOOSER_ACTION_OPEN) + , preview (persistent) + , found_search_btn (_("Search")) + , found_list_view (found_list) + , freesound_search_btn (_("Search")) + , freesound_list_view (freesound_list) + , resetting_ourselves (false) + , matches (0) + , _status (0) + , _done (false) + , ok_button (Stock::OK) + , cancel_button (Stock::CANCEL) + , apply_button (Stock::APPLY) + , gm (0) { - resetting_ourselves = false; - gm = 0; - - resetting_ourselves = false; - gm = 0; #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 -#ifdef FREESOUND - mootcher = new Mootcher(); -#endif - //add the file chooser - { - chooser.set_border_width (12); - - audio_and_midi_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun (*this, &SoundFileBrowser::on_audio_and_midi_filter)); - audio_and_midi_filter.set_name (_("Audio and MIDI files")); - - 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, 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.set_border_width (12); + + audio_and_midi_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun (*this, &SoundFileBrowser::on_audio_and_midi_filter)); + audio_and_midi_filter.set_name (_("Audio and MIDI files")); + + 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, 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 (audio_and_midi_filter); + chooser.add_filter (audio_filter); + chooser.add_filter (midi_filter); + chooser.add_filter (matchall_filter); + chooser.set_select_multiple (true); + 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)); - chooser.add_filter (audio_and_midi_filter); - chooser.add_filter (audio_filter); - chooser.add_filter (midi_filter); - chooser.add_filter (matchall_filter); - chooser.set_select_multiple (true); - 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)); + /* 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")); + + 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); + vpacker.set_spacing (6); + vpacker.pack_start (hpacker, true, true); + + add (vpacker); //add tag search - { - VBox* vbox; - HBox* hbox; + VBox* vbox; + HBox* hbox; + + + 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(sigc::mem_fun(*this, &SoundFileBrowser::found_list_view_selected)); + + 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)); + + freesound_stop_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_stop_clicked)); + + notebook.append_page (*vbox, _("Search Tags")); - hbox = manage(new HBox); - hbox->pack_start (found_entry); - hbox->pack_start (found_search_btn); +#ifdef FREESOUND - Gtk::ScrolledWindow *scroll = manage(new ScrolledWindow); - scroll->add(found_list_view); - scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + //add freesound search - vbox = manage(new VBox); - vbox->pack_start (*hbox, PACK_SHRINK); - vbox->pack_start (*scroll); + HBox* passbox; + Label* label; + + passbox = manage(new HBox); + passbox->set_spacing (6); + + label = manage (new Label); + label->set_text (_("Tags:")); + passbox->pack_start (*label, false, false); + passbox->pack_start (freesound_entry, true, true); + + label = manage (new Label); + label->set_text (_("Sort:")); + passbox->pack_start (*label, false, false); + 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); + + passbox->pack_start (freesound_search_btn, false, false); + passbox->pack_start (freesound_more_btn, false, false); + freesound_more_btn.set_label(_("More")); + freesound_more_btn.set_sensitive(false); + + passbox->pack_end (freesound_stop_btn, false, false); + freesound_stop_btn.set_label(_("Stop")); + freesound_stop_btn.set_sensitive(false); + + scroll = manage(new ScrolledWindow); + scroll->add(freesound_list_view); + scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + + vbox = manage(new VBox); + vbox->set_spacing (3); + vbox->pack_start (*passbox, PACK_SHRINK); + vbox->pack_start (freesound_progress_bar, PACK_SHRINK); + vbox->pack_start (*scroll); + + 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.append_column(_("Duration"), freesound_list_columns.duration); + freesound_list_view.append_column(_("Size"), freesound_list_columns.filesize); + freesound_list_view.append_column(_("Samplerate"), freesound_list_columns.smplrate); + freesound_list_view.append_column(_("License"), freesound_list_columns.license); + freesound_list_view.get_column(0)->set_alignment(0.5); + freesound_list_view.get_column(1)->set_expand(true); + freesound_list_view.get_column(2)->set_alignment(0.5); + freesound_list_view.get_column(3)->set_alignment(0.5); + freesound_list_view.get_column(4)->set_alignment(0.5); + freesound_list_view.get_column(5)->set_alignment(0.5); + + 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 (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)); + freesound_more_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_more_clicked)); + freesound_stop_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_stop_clicked)); + notebook.append_page (*vbox, _("Search Freesound")); +#endif - found_list_view.append_column(_("Paths"), found_list_columns.pathname); + notebook.set_size_request (500, -1); + notebook.signal_switch_page().connect (sigc::hide_return (sigc::hide (sigc::hide (sigc::mem_fun (*this, &SoundFileBrowser::reset_options))))); - found_list_view.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_list_view_selected)); + set_session (s); - found_list_view.signal_row_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::found_list_view_activated)); + Gtk::HButtonBox* button_box = manage (new HButtonBox); - 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)); + button_box->set_layout (BUTTONBOX_END); + button_box->pack_start (cancel_button, false, false); + cancel_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &SoundFileBrowser::do_something), RESPONSE_CANCEL)); + if (persistent) { + button_box->pack_start (apply_button, false, false); + apply_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &SoundFileBrowser::do_something), RESPONSE_APPLY)); + } - freesound_stop_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_stop_clicked)); + button_box->pack_start (ok_button, false, false); + ok_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &SoundFileBrowser::do_something), RESPONSE_OK)); - notebook.append_page (*vbox, _("Search Tags")); - } + Gtkmm2ext::UI::instance()->set_tip (ok_button, _("Press to import selected files and close this window")); + Gtkmm2ext::UI::instance()->set_tip (apply_button, _("Press to import selected files and leave this window open")); + Gtkmm2ext::UI::instance()->set_tip (cancel_button, _("Press to close this window without importing any files")); - //add freesound search -#ifdef FREESOUND - { - VBox* vbox; - HBox* passbox; - Label* label; - - passbox = manage(new HBox); - passbox->set_spacing (6); - - label = manage (new Label); - label->set_text (_("Tags:")); - passbox->pack_start (*label, false, false); - passbox->pack_start (freesound_entry, true, true); - - label = manage (new Label); - label->set_text (_("Sort:")); - passbox->pack_start (*label, false, false); - 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); - - passbox->pack_start (freesound_search_btn, false, false); - passbox->pack_end (freesound_stop_btn, false, false); - freesound_stop_btn.set_label(_("Stop")); - - 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->set_spacing (3); - vbox->pack_start (*passbox, PACK_SHRINK); - vbox->pack_start (freesound_progress_bar, PACK_SHRINK); - vbox->pack_start (*scroll); - - 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.append_column(_("Duration"), freesound_list_columns.duration); - freesound_list_view.append_column(_("Size"), freesound_list_columns.filesize); - freesound_list_view.append_column(_("Samplerate"), freesound_list_columns.smplrate); - freesound_list_view.append_column(_("License"), freesound_list_columns.license); - freesound_list_view.get_column(0)->set_alignment(0.5); - freesound_list_view.get_column(1)->set_expand(true); - freesound_list_view.get_column(2)->set_alignment(0.5); - freesound_list_view.get_column(3)->set_alignment(0.5); - freesound_list_view.get_column(4)->set_alignment(0.5); - freesound_list_view.get_column(5)->set_alignment(0.5); - - 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 (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)); - freesound_stop_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_stop_clicked)); - notebook.append_page (*vbox, _("Search Freesound")); - } + vpacker.pack_end (*button_box, false, false); -#endif + set_wmclass (X_("import"), PROGRAM_NAME); +} +SoundFileBrowser::~SoundFileBrowser () +{ + persistent_folder = chooser.get_current_folder(); +} - notebook.set_size_request (500, -1); - notebook.signal_switch_page().connect ( - sigc::hide_return (sigc::hide (sigc::hide (sigc::mem_fun (*this, &SoundFileBrowser::reset_options)))) - ); +int +SoundFileBrowser::run () +{ + set_modal (true); + show_all (); + present (); - set_session (s); + _done = false; - add_button (Stock::CANCEL, RESPONSE_CANCEL); - add_button (Stock::APPLY, RESPONSE_APPLY); - add_button (Stock::OK, RESPONSE_OK); + while (!_done) { + gtk_main_iteration (); + } + return _status; } -SoundFileBrowser::~SoundFileBrowser () +void +SoundFileBrowser::set_action_sensitive (bool yn) { - persistent_folder = chooser.get_current_folder(); + ok_button.set_sensitive (yn); + apply_button.set_sensitive (yn); } +void +SoundFileBrowser::do_something (int action) +{ + _done = true; + _status = action; +} void SoundFileBrowser::on_show () { - ArdourDialog::on_show (); + ArdourWindow::on_show (); start_metering (); } @@ -643,7 +691,7 @@ SoundFileBrowser::freesound_list_view_activated (const TreeModel::Path&, TreeVie void SoundFileBrowser::set_session (Session* s) { - ArdourDialog::set_session (s); + ArdourWindow::set_session (s); preview.set_session (s); if (_session) { @@ -663,6 +711,7 @@ SoundFileBrowser::add_gain_meter () boost::shared_ptr r = _session->the_auditioner (); gm->set_controls (r, r->shared_peak_meter(), r->amp()); + gm->set_fader_name (X_("AudioTrackFader")); meter_packer.set_border_width (12); meter_packer.pack_start (*gm, false, true); @@ -734,7 +783,7 @@ void SoundFileBrowser::found_list_view_selected () { if (!reset_options ()) { - set_response_sensitive (RESPONSE_OK, false); + set_action_sensitive (false); } else { string file; @@ -744,9 +793,9 @@ SoundFileBrowser::found_list_view_selected () TreeIter iter = found_list->get_iter(*rows.begin()); file = (*iter)[found_list_columns.pathname]; chooser.set_filename (file); - set_response_sensitive (RESPONSE_OK, true); + set_action_sensitive (true); } else { - set_response_sensitive (RESPONSE_OK, false); + set_action_sensitive (false); } preview.setup_labels (file); @@ -757,12 +806,13 @@ void SoundFileBrowser::freesound_list_view_selected () { freesound_download_cancel = false; + freesound_stop_btn.set_sensitive(true); #ifdef FREESOUND if (!reset_options ()) { - set_response_sensitive (RESPONSE_OK, false); + set_action_sensitive (false); } else { - + Mootcher mootcher; string file; TreeView::Selection::ListHandle_Path rows = freesound_list_view.get_selection()->get_selected_rows (); @@ -780,24 +830,25 @@ SoundFileBrowser::freesound_list_view_selected () gdk_window_set_cursor (get_window()->gobj(), gdk_cursor_new(GDK_WATCH)); gdk_flush(); - file = mootcher->getAudioFile(ofn, id, uri, this); + file = mootcher.getAudioFile(ofn, id, uri, this); gdk_window_set_cursor (get_window()->gobj(), prev_cursor); if (file != "") { chooser.set_filename (file); - set_response_sensitive (RESPONSE_OK, true); + set_action_sensitive (true); } } else { - set_response_sensitive (RESPONSE_OK, false); + set_action_sensitive (false); } freesound_progress_bar.set_text( - string_compose(_("found %1 matche(s)"), matches)); + string_compose(P_("found %1 match", "found %1 matches", matches), matches)); preview.setup_labels (file); } #endif + freesound_stop_btn.set_sensitive(false); } void @@ -827,15 +878,26 @@ SoundFileBrowser::found_search_clicked () void SoundFileBrowser::freesound_search_clicked () { - freesound_search_cancel = false; + freesound_page = 1; + freesound_list->clear(); + matches = 0; + freesound_search(); +} + +void +SoundFileBrowser::freesound_more_clicked () +{ + char row_path[21]; + freesound_page++; freesound_search(); + snprintf(row_path, 21, "%d", (freesound_page - 1) * 100); + freesound_list_view.scroll_to_row(Gtk::TreePath(row_path), 0); } void SoundFileBrowser::freesound_stop_clicked () { freesound_download_cancel = true; - freesound_search_cancel = true; } @@ -843,9 +905,8 @@ void SoundFileBrowser::freesound_search() { #ifdef FREESOUND - freesound_list->clear(); + Mootcher mootcher; freesound_list_view.get_column(1)->set_sizing(TREE_VIEW_COLUMN_GROW_ONLY); - matches = 0; string search_string = freesound_entry.get_text (); enum sortMethod sort_method = (enum sortMethod) freesound_sort.get_active_row_number(); @@ -856,173 +917,159 @@ SoundFileBrowser::freesound_search() freesound_progress_bar.set_fraction(0.0); gdk_flush(); - int freesound_n_pages = 1; - for (int page = 1; page <= 99 && page <= freesound_n_pages; page++ ) { - - std::string prog; - if (freesound_n_pages > 1) { - freesound_progress_bar.set_fraction(page/(float)freesound_n_pages); - prog = string_compose (_("Searching Page %1 of %2, click Stop to cancel"), page, freesound_n_pages); - } else { - prog = _("Searching, click Stop to cancel"); - } - freesound_progress_bar.set_text(prog); - while (Glib::MainContext::get_default()->iteration (false)) { - /* do nothing */ - } - - std::string theString = mootcher->searchText( + std::string theString = mootcher.searchText( search_string, - page, + freesound_page, #ifdef GTKOSX "", // OSX eats anything incl mp3 #else "type:wav OR type:aiff OR type:flac OR type:aif OR type:ogg OR type:oga", #endif sort_method - ); + ); - XMLTree doc; - doc.read_buffer( theString ); - XMLNode *root = doc.root(); + gdk_window_set_cursor (get_window()->gobj(), prev_cursor); - if (!root) { - error << "no root XML node!" << endmsg; - break; - } + XMLTree doc; + doc.read_buffer( theString ); + XMLNode *root = doc.root(); - if ( strcmp(root->name().c_str(), "response") != 0) { - error << string_compose ("root node name == %1 != \"response\"", root->name()) << endmsg; - break; - } + if (!root) { + error << "no root XML node!" << endmsg; + return; + } - //find out how many pages are available to search - XMLNode *res = root->child("num_pages"); - if (res) { - string result = res->child("text")->content(); - freesound_n_pages = atoi(result.c_str()); - } + if ( strcmp(root->name().c_str(), "response") != 0) { + error << string_compose ("root node name == %1 != \"response\"", root->name()) << endmsg; + return; + } - XMLNode *sounds_root = root->child("sounds"); - - if (!sounds_root) { - error << "no child node \"sounds\" found!" << endmsg; - break; - } - - XMLNodeList sounds = sounds_root->children(); - if (sounds.size() == 0) { - /* nothing found */ + // find out how many pages are available to search + int freesound_n_pages = 1; + XMLNode *res = root->child("num_pages"); + if (res) { + string result = res->child("text")->content(); + freesound_n_pages = atoi(result.c_str()); + } + + int more_pages = freesound_n_pages - freesound_page; + + if (more_pages > 0) { + freesound_more_btn.set_sensitive(true); + freesound_more_btn.set_tooltip_text(string_compose(P_( + "%1 more page of 100 results available", + "%1 more pages of 100 results available", + more_pages), more_pages)); + } else { + freesound_more_btn.set_sensitive(false); + freesound_more_btn.set_tooltip_text(_("No more results available")); + } + + XMLNode *sounds_root = root->child("sounds"); + if (!sounds_root) { + error << "no child node \"sounds\" found!" << endmsg; + return; + } + + XMLNodeList sounds = sounds_root->children(); + if (sounds.size() == 0) { + /* nothing found */ + return; + } + + XMLNodeConstIterator niter; + XMLNode *node; + for (niter = sounds.begin(); niter != sounds.end(); ++niter) { + node = *niter; + if( strcmp( node->name().c_str(), "resource") != 0 ) { + error << string_compose ("node->name()=%1 != \"resource\"", node->name()) << endmsg; break; } - XMLNodeConstIterator niter; - XMLNode *node; - for (niter = sounds.begin(); niter != sounds.end(); ++niter) { - node = *niter; - if( strcmp( node->name().c_str(), "resource") != 0 ){ - error << string_compose ("node->name()=%1 != \"resource\"", node->name()) << endmsg; - freesound_search_cancel = true; - break; - } + // node->dump(cerr, "node:"); - // node->dump(cerr, "node:"); - - XMLNode *id_node = node->child ("id"); - XMLNode *uri_node = node->child ("serve"); - XMLNode *ofn_node = node->child ("original_filename"); - XMLNode *dur_node = node->child ("duration"); - XMLNode *siz_node = node->child ("filesize"); - XMLNode *srt_node = node->child ("samplerate"); - XMLNode *lic_node = node->child ("license"); - - if (id_node && uri_node && ofn_node && dur_node && siz_node && srt_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 dur = dur_node->child("text")->content(); - std::string siz = siz_node->child("text")->content(); - std::string srt = srt_node->child("text")->content(); - std::string lic = lic_node->child("text")->content(); - - std::string r; - // cerr << "id=" << id << ",uri=" << uri << ",ofn=" << ofn << ",dur=" << dur << endl; - - double duration_seconds = atof(dur.c_str()); - double h, m, s; - char duration_hhmmss[16]; - if (duration_seconds >= 99 * 60 * 60) { - strcpy(duration_hhmmss, ">99h"); - } else { - s = modf(duration_seconds/60, &m) * 60; - m = modf(m/60, &h) * 60; - sprintf(duration_hhmmss, "%02.fh:%02.fm:%04.1fs", - h, m, s - ); - } - double size_bytes = atof(siz.c_str()); - char bsize[32]; - if (size_bytes < 1000) { - sprintf(bsize, "%.0f %s", size_bytes, _("B")); - } else if (size_bytes < 1000000 ) { - sprintf(bsize, "%.1f %s", size_bytes / 1000.0, _("kB")); - } else if (size_bytes < 10000000) { - sprintf(bsize, "%.1f %s", size_bytes / 1000000.0, _("MB")); - } else if (size_bytes < 1000000000) { - sprintf(bsize, "%.2f %s", size_bytes / 1000000.0, _("MB")); - } else { - sprintf(bsize, "%.2f %s", size_bytes / 1000000000.0, _("GB")); - } + XMLNode *id_node = node->child ("id"); + XMLNode *uri_node = node->child ("serve"); + XMLNode *ofn_node = node->child ("original_filename"); + XMLNode *dur_node = node->child ("duration"); + XMLNode *siz_node = node->child ("filesize"); + XMLNode *srt_node = node->child ("samplerate"); + XMLNode *lic_node = node->child ("license"); - /* see http://www.freesound.org/help/faq/#licenses */ - char shortlicense[64]; - if(!lic.compare(0, 42, "http://creativecommons.org/licenses/by-nc/")){ - sprintf(shortlicense, "CC-BY-NC"); - } else if(!lic.compare(0, 39, "http://creativecommons.org/licenses/by/")) { - sprintf(shortlicense, "CC-BY"); - } else if(!lic.compare("http://creativecommons.org/licenses/sampling+/1.0/")) { - sprintf(shortlicense, "sampling+"); - } else if(!lic.compare(0, 40, "http://creativecommons.org/publicdomain/")) { - sprintf(shortlicense, "PD"); - } else { - snprintf(shortlicense, 64, "%s", lic.c_str()); - shortlicense[63]= '\0'; - } + if (id_node && uri_node && ofn_node && dur_node && siz_node && srt_node) { - 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; - row[freesound_list_columns.duration] = duration_hhmmss; - row[freesound_list_columns.filesize] = bsize; - row[freesound_list_columns.smplrate] = srt; - row[freesound_list_columns.license ] = shortlicense; - matches++; + 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 dur = dur_node->child("text")->content(); + std::string siz = siz_node->child("text")->content(); + std::string srt = srt_node->child("text")->content(); + std::string lic = lic_node->child("text")->content(); + std::string r; + // cerr << "id=" << id << ",uri=" << uri << ",ofn=" << ofn << ",dur=" << dur << endl; + + double duration_seconds = atof(dur.c_str()); + double h, m, s; + char duration_hhmmss[16]; + if (duration_seconds >= 99 * 60 * 60) { + strcpy(duration_hhmmss, ">99h"); + } else { + s = modf(duration_seconds/60, &m) * 60; + m = modf(m/60, &h) * 60; + sprintf(duration_hhmmss, "%02.fh:%02.fm:%04.1fs", + h, m, s + ); + } + + double size_bytes = atof(siz.c_str()); + char bsize[32]; + if (size_bytes < 1000) { + sprintf(bsize, "%.0f %s", size_bytes, _("B")); + } else if (size_bytes < 1000000 ) { + sprintf(bsize, "%.1f %s", size_bytes / 1000.0, _("kB")); + } else if (size_bytes < 10000000) { + sprintf(bsize, "%.1f %s", size_bytes / 1000000.0, _("MB")); + } else if (size_bytes < 1000000000) { + sprintf(bsize, "%.2f %s", size_bytes / 1000000.0, _("MB")); + } else { + sprintf(bsize, "%.2f %s", size_bytes / 1000000000.0, _("GB")); } - } - - if (freesound_search_cancel) - break; - } //page "for" loop + /* see http://www.freesound.org/help/faq/#licenses */ + char shortlicense[64]; + if(!lic.compare(0, 42, "http://creativecommons.org/licenses/by-nc/")){ + sprintf(shortlicense, "CC-BY-NC"); + } else if(!lic.compare(0, 39, "http://creativecommons.org/licenses/by/")) { + sprintf(shortlicense, "CC-BY"); + } else if(!lic.compare("http://creativecommons.org/licenses/sampling+/1.0/")) { + sprintf(shortlicense, "sampling+"); + } else if(!lic.compare(0, 40, "http://creativecommons.org/publicdomain/")) { + sprintf(shortlicense, "PD"); + } else { + snprintf(shortlicense, 64, "%s", lic.c_str()); + shortlicense[63]= '\0'; + } - gdk_window_set_cursor (get_window()->gobj(), prev_cursor); + 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; + row[freesound_list_columns.duration] = duration_hhmmss; + row[freesound_list_columns.filesize] = bsize; + row[freesound_list_columns.smplrate] = srt; + row[freesound_list_columns.license ] = shortlicense; + matches++; + } + } - freesound_progress_bar.set_fraction(0.0); - switch (matches) { - case 0: - freesound_progress_bar.set_text(_("Search returned no results.")); - break; - case 1: - freesound_progress_bar.set_text(_("Found one match.")); - break; - default: - freesound_progress_bar.set_text(string_compose(_("Found %1 matche(s)"), matches)); + if (matches == 0) { + freesound_progress_bar.set_text(_("Search returned no results.")); + } else { + freesound_progress_bar.set_text(string_compose(P_("Found %1 match", "Found %1 matches", matches), matches)); } freesound_list_view.get_column(1)->set_sizing(TREE_VIEW_COLUMN_AUTOSIZE); #endif @@ -1060,6 +1107,7 @@ SoundFileBrowser::get_paths () } else { #ifdef FREESOUND typedef TreeView::Selection::ListHandle_Path ListPath; + Mootcher mootcher; ListPath rows = freesound_list_view.get_selection()->get_selected_rows (); for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) { @@ -1073,7 +1121,7 @@ SoundFileBrowser::get_paths () gdk_window_set_cursor (get_window()->gobj(), gdk_cursor_new(GDK_WATCH)); gdk_flush(); - string str = mootcher->getAudioFile(ofn, id, uri, this); + string str = mootcher.getAudioFile(ofn, id, uri, this); if (str != "") { results.push_back (str); } @@ -1291,8 +1339,9 @@ SoundFileOmega::reset_options () src_combo.set_sensitive (false); } - /* We must copy MIDI files or those from Freesound */ - bool const must_copy = have_a_midi_file || notebook.get_current_page() == 2; + /* We must copy MIDI files or those from Freesound + * or any file if we are under nsm control */ + bool const must_copy = _session->get_nsm_state() || have_a_midi_file || notebook.get_current_page() == 2; if (Config->get_only_copy_imported_files()) { @@ -1418,8 +1467,8 @@ SoundFileOmega::check_link_status (const Session* s, const vector& paths return ret; } -SoundFileChooser::SoundFileChooser (Gtk::Window& parent, string title, ARDOUR::Session* s) - : SoundFileBrowser (parent, title, s, false) +SoundFileChooser::SoundFileChooser (string title, ARDOUR::Session* s) + : SoundFileBrowser (title, s, false) { chooser.set_select_multiple (false); found_list_view.get_selection()->set_mode (SELECTION_SINGLE); @@ -1429,7 +1478,7 @@ SoundFileChooser::SoundFileChooser (Gtk::Window& parent, string title, ARDOUR::S void SoundFileChooser::on_hide () { - ArdourDialog::on_hide(); + ArdourWindow::on_hide(); stop_metering (); if (_session) { @@ -1455,12 +1504,12 @@ SoundFileChooser::get_filename () return paths.front(); } -SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Session* s, +SoundFileOmega::SoundFileOmega (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) + : SoundFileBrowser (title, s, persistent) , copy_files_btn ( _("Copy files to session")) , selected_audio_track_cnt (selected_audio_tracks) , selected_midi_track_cnt (selected_midi_tracks) @@ -1579,7 +1628,7 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi options.pack_start (block_four, false, false); - get_vbox()->pack_start (options, false, false); + vpacker.pack_start (options, false, false); /* setup disposition map */ @@ -1630,7 +1679,7 @@ SoundFileOmega::get_mode () const void SoundFileOmega::on_hide () { - ArdourDialog::on_hide(); + ArdourWindow::on_hide(); if (_session) { _session->cancel_audition(); } @@ -1655,7 +1704,7 @@ SoundFileOmega::get_position() const SrcQuality SoundFileOmega::get_src_quality() const { - string str = where_combo.get_active_text(); + string str = src_combo.get_active_text(); if (str == _("Best")) { return SrcBest; @@ -1714,13 +1763,59 @@ SoundFileOmega::file_selection_changed () } if (!reset_options ()) { - set_response_sensitive (RESPONSE_OK, false); + set_action_sensitive (false); } else { if (chooser.get_filenames().size() > 0) { - set_response_sensitive (RESPONSE_OK, true); + set_action_sensitive (true); } else { - set_response_sensitive (RESPONSE_OK, false); + set_action_sensitive (false); } } } +void +SoundFileOmega::do_something (int action) +{ + SoundFileBrowser::do_something (action); + + if (action == RESPONSE_CANCEL) { + hide (); + return; + } + + /* lets do it */ + + vector paths = get_paths (); + ImportPosition pos = get_position (); + ImportMode mode = get_mode (); + ImportDisposition chns = get_channel_disposition (); + framepos_t where; + + switch (pos) { + case ImportAtEditPoint: + where = PublicEditor::instance().get_preferred_edit_position (); + break; + case ImportAtTimestamp: + where = -1; + break; + case ImportAtPlayhead: + where = _session->transport_frame(); + break; + case ImportAtStart: + where = _session->current_start_frame(); + break; + } + + SrcQuality quality = get_src_quality(); + + if (copy_files_btn.get_active()) { + PublicEditor::instance().do_import (paths, chns, mode, quality, where); + } else { + PublicEditor::instance().do_embed (paths, chns, mode, where); + } + + if (action == RESPONSE_OK) { + hide (); + } +} +