X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsfdb_ui.cc;h=2e6235e70cefe8f3650d2292680b74fb828d0752;hb=92e412661772e6b9c83109b7ee4996f4c040d3f4;hp=b0b6a577f78a02d27286fb079a8cf6093bcb343f;hpb=c86210a9d5bdb7b36ad58552a1f99f53d48781b3;p=ardour.git diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index b0b6a577f7..2e6235e70c 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -29,25 +29,27 @@ #include #include -#include -#include -#include -#include -#include +#include "pbd/convert.h" +#include "pbd/tokenizer.h" +#include "pbd/enumwriter.h" +#include "pbd/pthread_utils.h" +#include "pbd/xml++.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "evoral/SMF.hpp" + +#include "ardour/amp.h" +#include "ardour/audio_library.h" +#include "ardour/auditioner.h" +#include "ardour/audioregion.h" +#include "ardour/audiofilesource.h" +#include "ardour/smf_source.h" +#include "ardour/region_factory.h" +#include "ardour/source_factory.h" +#include "ardour/session.h" +#include "ardour/session_directory.h" +#include "ardour/profile.h" #include "ardour_ui.h" #include "editing.h" @@ -89,7 +91,7 @@ string2importmode (string str) } warning << string_compose (_("programming error: unknown import mode string %1"), str) << endmsg; - + return ImportAsTrack; } @@ -111,21 +113,17 @@ 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, "EditCursorClock", false, false, true, false), + timecode_clock ("sfboxTimecodeClock", !persistent, "EditCursorClock", false, false, false, false), main_box (false, 6), autoplay_btn (_("Auto-play")) - -{ - HBox* hbox; - VBox* vbox; +{ set_name (X_("SoundFileBox")); set_size_request (300, -1); - preview_label.set_markup (_("Soundfile Info")); + preview_label.set_markup (_("Sound File Information")); border_frame.set_label_widget (preview_label); border_frame.add (main_box); @@ -134,73 +132,67 @@ SoundFileBox::SoundFileBox (bool persistent) set_border_width (6); main_box.set_border_width (6); - main_box.set_spacing (12); length.set_text (_("Length:")); + length.set_alignment (1, 0.5); timecode.set_text (_("Timestamp:")); + timecode.set_alignment (1, 0.5); format.set_text (_("Format:")); + format.set_alignment (1, 0.5); channels.set_text (_("Channels:")); + channels.set_alignment (1, 0.5); samplerate.set_text (_("Sample rate:")); + samplerate.set_alignment (1, 0.5); + + format_text.set_max_width_chars (8); + format_text.set_ellipsize (Pango::ELLIPSIZE_END); + format_text.set_alignment (0, 1); table.set_col_spacings (6); table.set_homogeneous (false); table.set_row_spacings (6); - table.attach (channels, 0, 1, 0, 1, FILL|EXPAND, (AttachOptions) 0); - table.attach (samplerate, 0, 1, 1, 2, FILL|EXPAND, (AttachOptions) 0); - table.attach (format, 0, 1, 2, 4, FILL|EXPAND, (AttachOptions) 0); - table.attach (length, 0, 1, 4, 5, FILL|EXPAND, (AttachOptions) 0); - table.attach (timecode, 0, 1, 5, 6, FILL|EXPAND, (AttachOptions) 0); + table.attach (channels, 0, 1, 0, 1, FILL, FILL); + table.attach (samplerate, 0, 1, 1, 2, FILL, FILL); + table.attach (format, 0, 1, 2, 4, FILL, FILL); + table.attach (length, 0, 1, 4, 5, FILL, FILL); + table.attach (timecode, 0, 1, 5, 6, FILL, FILL); - table.attach (channels_value, 1, 2, 0, 1, FILL, (AttachOptions) 0); - table.attach (samplerate_value, 1, 2, 1, 2, FILL, (AttachOptions) 0); - table.attach (format_text, 1, 2, 2, 4, FILL, AttachOptions (0)); - table.attach (length_clock, 1, 2, 4, 5, FILL, (AttachOptions) 0); - table.attach (timecode_clock, 1, 2, 5, 6, FILL, (AttachOptions) 0); + table.attach (channels_value, 1, 2, 0, 1, FILL, FILL); + table.attach (samplerate_value, 1, 2, 1, 2, FILL, FILL); + table.attach (format_text, 1, 2, 2, 4, FILL, FILL); + 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()); - timecode_clock.set_mode (AudioClock::SMPTE); + timecode_clock.set_mode (AudioClock::Timecode); - hbox = manage (new HBox); - hbox->pack_start (table, false, false); - main_box.pack_start (*hbox, false, false); + 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)); - hbox = manage (new HBox); - hbox->pack_start (tags_entry, true, true); - - vbox = manage (new VBox); + 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); - vbox->set_spacing (6); - vbox->pack_start(*label, false, false); - vbox->pack_start(*hbox, true, true); + main_box.pack_start (*label, false, false); + main_box.pack_start (tags_entry, true, true); + + main_box.pack_start (bottom_box, false, false); - main_box.pack_start(*vbox, true, true); - main_box.pack_start(bottom_box, false, false); - play_btn.set_image (*(manage (new Image (Stock::MEDIA_PLAY, ICON_SIZE_BUTTON)))); - play_btn.set_label (_("Play (double click)")); + play_btn.set_label (_("Play")); stop_btn.set_image (*(manage (new Image (Stock::MEDIA_STOP, ICON_SIZE_BUTTON)))); stop_btn.set_label (_("Stop")); - + bottom_box.set_homogeneous (false); bottom_box.set_spacing (6); bottom_box.pack_start(play_btn, true, true); bottom_box.pack_start(stop_btn, true, true); bottom_box.pack_start(autoplay_btn, false, false); - play_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::audition)); - stop_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::stop_audition)); - - length.set_alignment (0.0f, 0.5f); - format.set_alignment (0.0f, 0.5f); - channels.set_alignment (0.0f, 0.5f); - samplerate.set_alignment (0.0f, 0.5f); - timecode.set_alignment (0.0f, 0.5f); + 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); @@ -209,20 +201,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 ustring& filename) { if (!path.empty()) { // save existing tags @@ -235,23 +226,27 @@ SoundFileBox::setup_labels (const ustring& filename) if(!AudioFileSource::get_soundfile_info (filename, sf_info, error_msg)) { - preview_label.set_markup (_("Soundfile Info")); - format_text.set_text (_("n/a")); - channels_value.set_text (_("n/a")); - samplerate_value.set_text (_("n/a")); + preview_label.set_markup (_("Sound File Information")); + format_text.set_text (""); + channels_value.set_text (""); + samplerate_value.set_text (""); tags_entry.get_buffer()->set_text (""); length_clock.set (0); timecode_clock.set (0); - + tags_entry.set_sensitive (false); play_btn.set_sensitive (false); - + return false; } preview_label.set_markup (string_compose ("%1", Glib::path_get_basename (filename))); - format_text.set_text (sf_info.format_name); + std::string n = sf_info.format_name; + if (n.substr (0, 8) == X_("Format: ")) { + n = n.substr (8); + } + format_text.set_text (n); channels_value.set_text (to_string (sf_info.channels, std::dec)); if (_session && sf_info.samplerate != _session->frame_rate()) { @@ -266,7 +261,8 @@ SoundFileBox::setup_labels (const ustring& filename) samplerate.set_name ("NewSessionSR2Label"); } - double src_coef = (double) _session->nominal_frame_rate() / sf_info.samplerate; + nframes_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); timecode_clock.set (sf_info.timecode * src_coef + 0.5, true); @@ -274,7 +270,7 @@ SoundFileBox::setup_labels (const ustring& filename) // this is a hack that is fixed in trunk, i think (august 26th, 2007) vector tags = Library->get_tags (string ("//") + filename); - + stringstream tag_string; for (vector::iterator i = tags.begin(); i != tags.end(); ++i) { if (i != tags.begin()) { @@ -283,12 +279,12 @@ SoundFileBox::setup_labels (const ustring& filename) tag_string << *i; } tags_entry.get_buffer()->set_text (tag_string.str()); - + tags_entry.set_sensitive (true); if (_session) { play_btn.set_sensitive (true); } - + return true; } @@ -311,7 +307,12 @@ SoundFileBox::audition () if (!_session) { return; } - + + if (SMFSource::safe_midi_file_extension (path)) { + error << _("Auditioning of MIDI files is not yet supported") << endmsg; + return; + } + _session->cancel_audition(); if (!Glib::file_test (path, Glib::FILE_TEST_EXISTS)) { @@ -330,11 +331,12 @@ SoundFileBox::audition () for (int n = 0; n < sf_info.channels; ++n) { try { - afs = boost::dynamic_pointer_cast (SourceFactory::createReadable (DataType::AUDIO, *_session, path, - n, AudioFileSource::Flag (0), false)); - + afs = boost::dynamic_pointer_cast ( + SourceFactory::createReadable (DataType::AUDIO, *_session, + path, n, Source::Flag (0), false)); + srclist.push_back(afs); - + } catch (failed_constructor& err) { error << _("Could not access soundfile: ") << path << endmsg; AudioSource::set_build_peakfiles (old_sbp); @@ -343,14 +345,22 @@ SoundFileBox::audition () } AudioSource::set_build_peakfiles (old_sbp); - + if (srclist.empty()) { return; } - + 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(), 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); } @@ -364,7 +374,7 @@ SoundFileBox::stop_audition () } bool -SoundFileBox::tags_entry_left (GdkEventFocus *ev) +SoundFileBox::tags_entry_left (GdkEventFocus *) { tags_changed (); return false; @@ -417,18 +427,21 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S 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:///Volumes"); +#endif //add the file chooser { chooser.set_border_width (12); - audio_filter.add_custom (FILE_FILTER_FILENAME, mem_fun(*this, &SoundFileBrowser::on_audio_filter)); + audio_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun(*this, &SoundFileBrowser::on_audio_filter)); audio_filter.set_name (_("Audio files")); - - midi_filter.add_custom (FILE_FILTER_FILENAME, mem_fun(*this, &SoundFileBrowser::on_midi_filter)); + + midi_filter.add_custom (FILE_FILTER_FILENAME, sigc::mem_fun(*this, &SoundFileBrowser::on_midi_filter)); midi_filter.set_name (_("MIDI files")); - + matchall_filter.add_pattern ("*.*"); matchall_filter.set_name (_("All files")); @@ -436,15 +449,25 @@ 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); } notebook.append_page (chooser, _("Browse Files")); } - + + hpacker.set_spacing (6); + hpacker.pack_start (notebook, true, true); + hpacker.pack_start (preview, false, false); + + get_vbox()->pack_start (hpacker, true, true); + //add tag search { VBox* vbox; @@ -454,7 +477,7 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S 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); @@ -462,15 +485,15 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S vbox = manage(new VBox); vbox->pack_start (*hbox, PACK_SHRINK); vbox->pack_start (*scroll); - + found_list_view.append_column(_("Paths"), found_list_columns.pathname); - found_list_view.get_selection()->signal_changed().connect(mem_fun(*this, &SoundFileBrowser::found_list_view_selected)); - - found_list_view.signal_row_activated().connect (mem_fun (*this, &SoundFileBrowser::found_list_view_activated)); + found_list_view.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_list_view_selected)); - found_search_btn.signal_clicked().connect(mem_fun(*this, &SoundFileBrowser::found_search_clicked)); - found_entry.signal_activate().connect(mem_fun(*this, &SoundFileBrowser::found_search_clicked)); + found_list_view.signal_row_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::found_list_view_activated)); + + found_search_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_search_clicked)); + found_entry.signal_activate().connect(sigc::mem_fun(*this, &SoundFileBrowser::found_search_clicked)); notebook.append_page (*vbox, _("Search Tags")); } @@ -499,7 +522,7 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S passbox->pack_start (*label, false, false); passbox->pack_start (freesound_entry, false, false); passbox->pack_start (freesound_search_btn, false, false); - + Gtk::ScrolledWindow *scroll = manage(new ScrolledWindow); scroll->add(freesound_list_view); scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); @@ -507,20 +530,20 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S vbox = manage(new VBox); vbox->pack_start (*passbox, PACK_SHRINK); vbox->pack_start(*scroll); - + //vbox->pack_start (freesound_list_view); freesound_list_view.append_column(_("Paths"), freesound_list_columns.pathname); - freesound_list_view.get_selection()->signal_changed().connect(mem_fun(*this, &SoundFileBrowser::freesound_list_view_selected)); - + freesound_list_view.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_list_view_selected)); + //freesound_list_view.get_selection()->set_mode (SELECTION_MULTIPLE); - freesound_list_view.signal_row_activated().connect (mem_fun (*this, &SoundFileBrowser::freesound_list_view_activated)); - freesound_search_btn.signal_clicked().connect(mem_fun(*this, &SoundFileBrowser::freesound_search_clicked)); - freesound_entry.signal_activate().connect(mem_fun(*this, &SoundFileBrowser::freesound_search_clicked)); + freesound_list_view.signal_row_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::freesound_list_view_activated)); + freesound_search_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_search_clicked)); + freesound_entry.signal_activate().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_search_clicked)); notebook.append_page (*vbox, _("Search Freesound")); } #endif - + notebook.set_size_request (500, -1); @@ -529,7 +552,7 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S add_button (Stock::CANCEL, RESPONSE_CANCEL); add_button (Stock::APPLY, RESPONSE_APPLY); add_button (Stock::OK, RESPONSE_OK); - + } SoundFileBrowser::~SoundFileBrowser () @@ -559,13 +582,13 @@ SoundFileBrowser::chooser_file_activated () } void -SoundFileBrowser::found_list_view_activated (const TreeModel::Path& path, TreeViewColumn* col) +SoundFileBrowser::found_list_view_activated (const TreeModel::Path&, TreeViewColumn*) { preview.audition (); } void -SoundFileBrowser::freesound_list_view_activated (const TreeModel::Path& path, TreeViewColumn* col) +SoundFileBrowser::freesound_list_view_activated (const TreeModel::Path&, TreeViewColumn*) { preview.audition (); } @@ -575,7 +598,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 (); @@ -585,11 +609,13 @@ SoundFileBrowser::set_session (Session* s) void SoundFileBrowser::add_gain_meter () { - if (gm) { - delete gm; - } + delete gm; - gm = new GainMeter (session->the_auditioner(), *session); + gm = new GainMeter (_session, 250); + + boost::shared_ptr r = _session->the_auditioner (); + + gm->set_controls (r, r->shared_peak_meter(), r->amp()); meter_packer.set_border_width (12); meter_packer.pack_start (*gm, false, true); @@ -612,7 +638,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 @@ -624,7 +650,7 @@ SoundFileBrowser::stop_metering () void SoundFileBrowser::meter () { - if (is_mapped () && session && gm) { + if (is_mapped () && _session && gm) { gm->update_meters (); } } @@ -632,13 +658,13 @@ SoundFileBrowser::meter () bool SoundFileBrowser::on_audio_filter (const FileFilter::Info& filter_info) { - return AudioFileSource::safe_file_extension (filter_info.filename); + return AudioFileSource::safe_audio_file_extension (filter_info.filename); } bool SoundFileBrowser::on_midi_filter (const FileFilter::Info& filter_info) { - return SMFSource::safe_file_extension (filter_info.filename); + return SMFSource::safe_midi_file_extension (filter_info.filename); } void @@ -646,7 +672,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)); } } } @@ -660,7 +686,7 @@ SoundFileBrowser::found_list_view_selected () ustring file; TreeView::Selection::ListHandle_Path rows = found_list_view.get_selection()->get_selected_rows (); - + if (!rows.empty()) { TreeIter iter = found_list->get_iter(*rows.begin()); file = (*iter)[found_list_columns.pathname]; @@ -669,7 +695,7 @@ SoundFileBrowser::found_list_view_selected () } else { set_response_sensitive (RESPONSE_OK, false); } - + preview.setup_labels (file); } } @@ -683,7 +709,7 @@ SoundFileBrowser::freesound_list_view_selected () ustring 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]; @@ -692,7 +718,7 @@ SoundFileBrowser::freesound_list_view_selected () } else { set_response_sensitive (RESPONSE_OK, false); } - + preview.setup_labels (file); } } @@ -708,10 +734,10 @@ SoundFileBrowser::found_search_clicked () warning << _("SoundFileBrowser: Could not tokenize string: ") << tag_string << endmsg; return; } - + vector results; Library->search_members_and (results, tags); - + found_list->clear(); for (vector::iterator i = results.begin(); i != results.end(); ++i) { TreeModel::iterator new_row = found_list->append(); @@ -724,10 +750,10 @@ SoundFileBrowser::found_search_clicked () void* freesound_search_thread_entry (void* arg) { - PBD::ThreadCreated (pthread_self(), X_("Freesound Search")); + SessionEvent::create_per_thread_pool ("freesound events", 64); static_cast(arg)->freesound_search_thread (); - + return 0; } @@ -739,7 +765,7 @@ SoundFileBrowser::freesound_search_clicked () { if (canceling) //already canceling, button does nothing return; - + if ( searching ) { freesound_search_btn.set_label(_("Cancelling..")); canceling = true; @@ -747,13 +773,17 @@ SoundFileBrowser::freesound_search_clicked () searching = true; freesound_search_btn.set_label(_("Cancel")); pthread_t freesound_thr; - pthread_create_and_store ("freesound_search", &freesound_thr, 0, freesound_search_thread_entry, this); + pthread_create_and_store ("freesound_search", &freesound_thr, freesound_search_thread_entry, this); } } void SoundFileBrowser::freesound_search_thread() { +#if 0 + + THIS IS ALL TOTALLY THREAD-ILLEGAL ... YOU CANNOT DO GTK STUFF IN THIS THREAD + #ifdef FREESOUND freesound_list->clear(); @@ -761,7 +791,7 @@ SoundFileBrowser::freesound_search_thread() path = Glib::get_home_dir(); path += "/Freesound/"; Mootcher theMootcher(path.c_str()); - + string name_string = freesound_name_entry.get_text (); string pass_string = freesound_pass_entry.get_text (); string search_string = freesound_entry.get_text (); @@ -790,7 +820,7 @@ SoundFileBrowser::freesound_search_thread() TreeModel::iterator new_row = freesound_list->append(); TreeModel::Row row = *new_row; string path = Glib::filename_from_uri (string ("file:") + filename); - row[freesound_list_columns.pathname] = path; + row[freesound_list_columns.pathname] = path; } } } @@ -801,15 +831,17 @@ SoundFileBrowser::freesound_search_thread() canceling = false; freesound_search_btn.set_label(_("Start Downloading")); #endif +#endif + } vector SoundFileBrowser::get_paths () { vector results; - + int n = notebook.get_current_page (); - + if (n == 0) { vector filenames = chooser.get_filenames(); vector::iterator i; @@ -820,27 +852,27 @@ SoundFileBrowser::get_paths () results.push_back (*i); } } - + } else if (n==1){ - + typedef TreeView::Selection::ListHandle_Path ListPath; - + ListPath rows = found_list_view.get_selection()->get_selected_rows (); for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) { TreeIter iter = found_list->get_iter(*i); ustring str = (*iter)[found_list_columns.pathname]; - + results.push_back (str); } } else { - + typedef TreeView::Selection::ListHandle_Path ListPath; - + ListPath rows = freesound_list_view.get_selection()->get_selected_rows (); for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) { TreeIter iter = freesound_list->get_iter(*i); ustring str = (*iter)[freesound_list_columns.pathname]; - + results.push_back (str); } } @@ -891,11 +923,11 @@ 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; } @@ -905,26 +937,26 @@ SoundFileOmega::reset_options () if (selected_track_cnt > 0) { if (channel_combo.get_active_text().length()) { ImportDisposition id = get_channel_disposition(); - + switch (id) { case Editing::ImportDistinctFiles: if (selected_track_cnt == paths.size()) { action_strings.push_back (importmode2string (ImportToTrack)); } break; - + case Editing::ImportDistinctChannels: /* XXX it would be nice to allow channel-per-selected track - but its too hard we don't want to deal with all the + but its too hard we don't want to deal with all the different per-file + per-track channel configurations. */ break; - + default: action_strings.push_back (importmode2string (ImportToTrack)); break; } - } + } } action_strings.push_back (importmode2string (ImportAsTrack)); @@ -964,7 +996,7 @@ SoundFileOmega::reset_options () } vector channel_strings; - + if (mode == ImportAsTrack || mode == ImportAsTapeTrack || mode == ImportToTrack) { channel_strings.push_back (_("one track per file")); @@ -980,9 +1012,9 @@ 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")); } - + } } else { @@ -1025,7 +1057,7 @@ SoundFileOmega::reset_options () } else { src_combo.set_sensitive (false); } - + if (Config->get_only_copy_imported_files()) { if (selection_can_be_embedded_with_links) { @@ -1038,15 +1070,15 @@ SoundFileOmega::reset_options () copy_files_btn.set_sensitive (true); } - + return true; -} +} bool SoundFileOmega::bad_file_message() { - MessageDialog msg (*this, + MessageDialog msg (*this, _("One or more of the selected files\ncannot be used by Ardour"), true, Gtk::MESSAGE_INFO, @@ -1085,18 +1117,19 @@ SoundFileOmega::check_info (const vector& paths, bool& same_size, bool& } } - if ((nframes_t) info.samplerate != session->frame_rate()) { + if ((nframes_t) info.samplerate != _session->frame_rate()) { src_needed = true; } - } else if (SMFSource::safe_file_extension (*i)) { + } else if (SMFSource::safe_midi_file_extension (*i)) { - SMFReader reader(*i); + Evoral::SMF reader; + reader.open(*i); if (reader.num_tracks() > 1) { multichannel = true; // "channel" == track here... } - /* XXX we need err = true handling here in case + /* XXX we need err = true handling here in case we can't check the file */ @@ -1110,9 +1143,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; @@ -1121,7 +1154,7 @@ SoundFileOmega::check_link_status (const Session& s, const vector& path return false; } } - + for (vector::const_iterator i = paths.begin(); i != paths.end(); ++i) { char tmpc[MAXPATHLEN+1]; @@ -1133,7 +1166,7 @@ SoundFileOmega::check_link_status (const Session& s, const vector& path if (link ((*i).c_str(), tmpc)) { goto out; } - + unlink (tmpc); } @@ -1158,8 +1191,8 @@ SoundFileChooser::on_hide () ArdourDialog::on_hide(); stop_metering (); - if (session) { - session->cancel_audition(); + if (_session) { + _session->cancel_audition(); } } @@ -1173,7 +1206,7 @@ SoundFileChooser::get_filename () if (paths.empty()) { return ustring (); } - + if (!Glib::file_test (paths.front(), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) { return ustring(); } @@ -1192,24 +1225,24 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi vector str; set_size_request (-1, 450); - + block_two.set_border_width (12); block_three.set_border_width (12); block_four.set_border_width (12); - + options.set_spacing (12); str.clear (); - str.push_back (_("use file timestamp")); - str.push_back (_("at edit point")); - str.push_back (_("at playhead")); - str.push_back (_("at session start")); + str.push_back (_("file timestamp")); + str.push_back (_("edit point")); + str.push_back (_("playhead")); + str.push_back (_("session start")); set_popdown_strings (where_combo, str); where_combo.set_active_text (str.front()); Label* l = manage (new Label); l->set_text (_("Add files:")); - + hbox = manage (new HBox); hbox->set_border_width (12); hbox->set_spacing (6); @@ -1219,7 +1252,7 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi vbox->pack_start (*hbox, false, false); options.pack_start (*vbox, false, false); - /* dummy entry for action combo so that it doesn't look odd if we + /* dummy entry for action combo so that it doesn't look odd if we come up with no tracks selected. */ @@ -1230,7 +1263,7 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi action_combo.set_sensitive (false); l = manage (new Label); - l->set_text (_("Insert:")); + l->set_text (_("Insert at:")); hbox = manage (new HBox); hbox->set_border_width (12); @@ -1261,7 +1294,7 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi channel_combo.set_sensitive (false); l = manage (new Label); - l->set_text (_("Conversion Quality:")); + l->set_text (_("Conversion quality:")); hbox = manage (new HBox); hbox->set_border_width (12); @@ -1285,8 +1318,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)); + copy_files_btn.set_active (true); block_four.pack_start (copy_files_btn, false, false); @@ -1305,8 +1338,28 @@ SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Sessi 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)); - - chooser.signal_selection_changed().connect (mem_fun (*this, &SoundFileOmega::file_selection_changed)); + disposition_map.insert (pair(_("all files in one track"), ImportMergeFiles)); + + chooser.signal_selection_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::file_selection_changed)); + + /* set size requests for a couple of combos to allow them to display the longest text + they will ever be asked to display. This prevents them being resized when the user + selects a file to import, which in turn prevents the size of the dialog from jumping + around. */ + + vector t; + t.push_back (_("one track per file")); + t.push_back (_("one track per channel")); + t.push_back (_("sequence files")); + t.push_back (_("all files in one region")); + set_size_request_to_display_given_text (channel_combo, t, COMBO_FUDGE + 10, 15); + + t.clear (); + t.push_back (importmode2string (ImportAsTrack)); + t.push_back (importmode2string (ImportToTrack)); + t.push_back (importmode2string (ImportAsRegion)); + t.push_back (importmode2string (ImportAsTapeTrack)); + set_size_request_to_display_given_text (action_combo, t, COMBO_FUDGE + 10, 15); } void @@ -1325,8 +1378,8 @@ void SoundFileOmega::on_hide () { ArdourDialog::on_hide(); - if (session) { - session->cancel_audition(); + if (_session) { + _session->cancel_audition(); } } @@ -1335,11 +1388,11 @@ SoundFileOmega::get_position() const { ustring str = where_combo.get_active_text(); - if (str == _("use file timestamp")) { + if (str == _("file timestamp")) { return ImportAtTimestamp; - } else if (str == _("at edit point")) { + } else if (str == _("edit point")) { return ImportAtEditPoint; - } else if (str == _("at playhead")) { + } else if (str == _("playhead")) { return ImportAtPlayhead; } else { return ImportAtStart; @@ -1388,7 +1441,7 @@ SoundFileOmega::reset (int selected_tracks) { selected_track_cnt = selected_tracks; reset_options (); -} +} void SoundFileOmega::file_selection_changed ()