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"))
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);
afs = boost::dynamic_pointer_cast<AudioFileSource> (srclist[0]);
string rname = region_name_from_path (afs->path(), false);
-
- PropertyList plist;
-
+
+ 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);
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;
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
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);
+ 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->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));
+ freesound_stop_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_stop_clicked));
notebook.append_page (*vbox, _("Search Freesound"));
}
#endif
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];
- chooser.set_filename (file);
- set_response_sensitive (RESPONSE_OK, true);
+
+ 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();
+
+ freesound_stop = false;
+ file = theMootcher.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);
+ }
} else {
set_response_sensitive (RESPONSE_OK, false);
}
preview.setup_labels (file);
}
+#endif
}
void
}
}
-void*
-freesound_search_thread_entry (void* arg)
-{
- SessionEvent::create_per_thread_pool ("freesound events", 64);
-
- static_cast<SoundFileBrowser*>(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_stop_clicked ()
{
-#if 0
+ freesound_stop = true;
+}
- THIS IS ALL TOTALLY THREAD-ILLEGAL ... YOU CANNOT DO GTK STUFF IN THIS THREAD
+void
+SoundFileBrowser::freesound_search()
+{
#ifdef FREESOUND
freesound_list->clear();
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<string>
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();
+
+ freesound_stop = false;
+ string str = theMootcher.getAudioFile(ofn, id, uri, this);
+ if (str != "") {
+ results.push_back (str);
+ }
+
+ gdk_window_set_cursor (get_window()->gobj(), prev_cursor);
- results.push_back (str);
}
+#endif
}
return results;
string existing_choice;
vector<string> 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));
}
}
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;
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);
+ set_popdown_strings (channel_combo, t);
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);
+ set_popdown_strings (action_combo, t);
}
void
}
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 ();
}
projects / ardour.git / blobdiff