X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsfdb_ui.cc;h=f18831b404ab618963df9a2d119c0c46eb7fa5fa;hb=90619f4b9869ceccb29965e916ec07fe197b86da;hp=39c8c2510db267f90d38fecee2e580bd6f40d4f4;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 39c8c2510d..f18831b404 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -118,8 +118,8 @@ importmode2string (ImportMode mode) SoundFileBox::SoundFileBox (bool persistent) : table (6, 2), - length_clock ("sfboxLengthClock", !persistent, "EditCursorClock", false, false, true, false), - timecode_clock ("sfboxTimecodeClock", !persistent, "EditCursorClock", false, false, false, false), + length_clock ("sfboxLengthClock", !persistent, "", false, false, true, false), + timecode_clock ("sfboxTimecodeClock", !persistent, "", false, false, false, false), main_box (false, 6), autoplay_btn (_("Auto-play")) @@ -171,7 +171,7 @@ 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); @@ -421,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; @@ -516,33 +516,53 @@ 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.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.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)); @@ -709,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 { + + 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 { @@ -727,6 +768,7 @@ SoundFileBrowser::freesound_list_view_selected () preview.setup_labels (file); } +#endif } void @@ -753,43 +795,16 @@ SoundFileBrowser::found_search_clicked () } } -void* -freesound_search_thread_entry (void* arg) -{ - SessionEvent::create_per_thread_pool ("freesound events", 64); - - 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, freesound_search_thread_entry, this); - } + freesound_search(); } + void -SoundFileBrowser::freesound_search_thread() +SoundFileBrowser::freesound_search() { -#if 0 - - THIS IS ALL TOTALLY THREAD-ILLEGAL ... YOU CANNOT DO GTK STUFF IN THIS THREAD - #ifdef FREESOUND freesound_list->clear(); @@ -798,47 +813,80 @@ 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; } - searching = false; - canceling = false; - freesound_search_btn.set_label(_("Start Downloading")); -#endif -#endif + 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; + + } + } +#endif } vector @@ -871,16 +919,34 @@ SoundFileBrowser::get_paths () 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); - string 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; @@ -940,28 +1006,41 @@ SoundFileOmega::reset_options () 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) { - switch (id) { - case Editing::ImportDistinctFiles: - if (selected_track_cnt == paths.size()) { + /* AUDIO */ + + 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)); } } @@ -1225,11 +1304,15 @@ SoundFileChooser::get_filename () 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; @@ -1449,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 (); }