*/
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
+#include "pbd/i18n.h"
+
#include <map>
#include <cerrno>
#include <sstream>
#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/param.h>
+#include <limits.h>
#include <gtkmm/box.h>
+#include <gtkmm/scrolledwindow.h>
#include <gtkmm/stock.h>
+
+#include "pbd/gstdio_compat.h"
#include <glibmm/fileutils.h>
-#include "pbd/convert.h"
#include "pbd/tokenizer.h"
#include "pbd/enumwriter.h"
#include "pbd/pthread_utils.h"
+#include "pbd/string_convert.h"
#include "pbd/xml++.h"
#include <gtkmm2ext/utils.h>
#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/midi_region.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/srcfilesource.h"
#include "ardour/profile.h"
#include "ardour_ui.h"
#include "editing.h"
#include "gui_thread.h"
-#include "prompter.h"
#include "sfdb_ui.h"
#include "editing.h"
-#include "utils.h"
#include "gain_meter.h"
+#include "main_clock.h"
+#include "public_editor.h"
+#include "timers.h"
+#include "ui_config.h"
-#ifdef FREESOUND
#include "sfdb_freesound_mootcher.h"
-#endif
-
-#include "i18n.h"
using namespace ARDOUR;
using namespace PBD;
using std::string;
string SoundFileBrowser::persistent_folder;
+typedef TreeView::Selection::ListHandle_Path ListPath;
+
+static MidiTrackNameSource
+string2miditracknamesource (string const & str)
+{
+ if (str == _("by track number")) {
+ return SMFTrackNumber;
+ } else if (str == _("by track name")) {
+ return SMFTrackName;
+ } else if (str == _("by instrument name")) {
+ return SMFInstrumentName;
+ }
+
+ warning << string_compose (_("programming error: unknown midi track name source string %1"), str) << endmsg;
+
+ return SMFTrackNumber;
+}
static ImportMode
-string2importmode (string str)
+string2importmode (string const & str)
{
if (str == _("as new tracks")) {
return ImportAsTrack;
case ImportAsTapeTrack:
return _("as new tape tracks");
}
- /*NOTREACHED*/
+ abort(); /*NOTREACHED*/
return _("as new tracks");
}
-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),
+SoundFileBox::SoundFileBox (bool /*persistent*/)
+ : table (7, 2),
+ length_clock ("sfboxLengthClock", true, "", false, false, true, false),
+ timecode_clock ("sfboxTimecodeClock", true, "", false, false, false, false),
main_box (false, 6),
- autoplay_btn (_("Auto-play"))
+ autoplay_btn (_("Auto-play")),
+ seek_slider(0,1000,1),
+ _seeking(false),
+ _src_quality (SrcBest),
+ _import_position (ImportAtTimestamp)
{
set_name (X_("SoundFileBox"));
channels.set_alignment (1, 0.5);
samplerate.set_text (_("Sample rate:"));
samplerate.set_alignment (1, 0.5);
+ tempomap.set_text (_("Tempo Map:"));
+ tempomap.set_alignment (1, 0.5);
+
+ preview_label.set_max_width_chars (50);
+ preview_label.set_ellipsize (Pango::ELLIPSIZE_END);
- format_text.set_max_width_chars (8);
+ format_text.set_max_width_chars (20);
format_text.set_ellipsize (Pango::ELLIPSIZE_END);
format_text.set_alignment (0, 1);
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 (tempomap, 0, 1, 6, 7, FILL, FILL);
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);
+ table.attach (tempomap_value, 1, 2, 6, 7, FILL, FILL);
- length_clock.set_mode (ARDOUR_UI::instance()->secondary_clock.mode());
+ length_clock.set_mode (ARDOUR_UI::instance()->secondary_clock->mode());
timecode_clock.set_mode (AudioClock::Timecode);
main_box.pack_start (table, false, false);
tags_entry.set_editable (true);
+ tags_entry.set_wrap_mode(Gtk::WRAP_WORD);
tags_entry.signal_focus_out_event().connect (sigc::mem_fun (*this, &SoundFileBox::tags_entry_left));
Label* label = manage (new Label (_("Tags:")));
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"));
+// play_btn.set_label (_("Play"));
stop_btn.set_image (*(manage (new Image (Stock::MEDIA_STOP, ICON_SIZE_BUTTON))));
- stop_btn.set_label (_("Stop"));
+// stop_btn.set_label (_("Stop"));
bottom_box.set_homogeneous (false);
bottom_box.set_spacing (6);
bottom_box.pack_start(stop_btn, true, true);
bottom_box.pack_start(autoplay_btn, false, false);
+ seek_slider.set_draw_value(false);
+
+ seek_slider.add_events(Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+ seek_slider.signal_button_press_event().connect(sigc::mem_fun(*this, &SoundFileBox::seek_button_press), false);
+ seek_slider.signal_button_release_event().connect(sigc::mem_fun(*this, &SoundFileBox::seek_button_release), false);
+ main_box.pack_start (seek_slider, false, false);
+
play_btn.signal_clicked().connect (sigc::mem_fun (*this, &SoundFileBox::audition));
stop_btn.signal_clicked().connect (sigc::mem_fun (*this, &SoundFileBox::stop_audition));
+ update_autoplay ();
+ autoplay_btn.signal_toggled().connect(sigc::mem_fun (*this, &SoundFileBox::autoplay_toggled));
+
+ stop_btn.set_sensitive (false);
+
channels_value.set_alignment (0.0f, 0.5f);
samplerate_value.set_alignment (0.0f, 0.5f);
}
if (!_session) {
play_btn.set_sensitive (false);
stop_btn.set_sensitive (false);
+ auditioner_connections.drop_connections();
+ } else {
+ auditioner_connections.drop_connections();
+ _session->AuditionActive.connect(auditioner_connections, invalidator (*this), boost::bind (&SoundFileBox::audition_active, this, _1), gui_context());
+ _session->the_auditioner()->AuditionProgress.connect(auditioner_connections, invalidator (*this), boost::bind (&SoundFileBox::audition_progress, this, _1, _2), gui_context());
+ }
+}
+
+void
+SoundFileBox::audition_active(bool active) {
+ stop_btn.set_sensitive (active);
+ seek_slider.set_sensitive (active);
+ if (!active) {
+ seek_slider.set_value(0);
+ }
+}
+
+void
+SoundFileBox::audition_progress(ARDOUR::framecnt_t pos, ARDOUR::framecnt_t len) {
+ if (!_seeking) {
+ seek_slider.set_value( 1000.0 * pos / len);
+ seek_slider.set_sensitive (true);
}
}
+bool
+SoundFileBox::seek_button_press(GdkEventButton*) {
+ _seeking = true;
+ return false; // pass on to slider
+}
+
+bool
+SoundFileBox::seek_button_release(GdkEventButton*) {
+ _seeking = false;
+ _session->the_auditioner()->seek_to_percent(seek_slider.get_value() / 10.0);
+ seek_slider.set_sensitive (false);
+ return false; // pass on to slider
+}
+
bool
SoundFileBox::setup_labels (const string& filename)
{
string error_msg;
+ if (SMFSource::valid_midi_file (path)) {
+
+ boost::shared_ptr<SMFSource> ms;
+ try {
+ ms = boost::dynamic_pointer_cast<SMFSource> (
+ SourceFactory::createExternal (DataType::MIDI, *_session,
+ path, 0, Source::Flag (0), false));
+ } catch (const std::exception& e) {
+ error << string_compose(_("Could not read file: %1 (%2)."),
+ path, e.what()) << endmsg;
+ }
+
+ preview_label.set_markup (_("<b>Midi File Information</b>"));
+
+ format_text.set_text ("MIDI");
+ samplerate_value.set_text ("-");
+ tags_entry.get_buffer()->set_text ("");
+ timecode_clock.set (0);
+ tags_entry.set_sensitive (false);
+
+ if (ms) {
+ if (ms->is_type0()) {
+ channels_value.set_text (to_string<uint32_t>(ms->channels().size()));
+ } else {
+ if (ms->num_tracks() > 1) {
+ channels_value.set_text (to_string(ms->num_tracks()) + _("(Tracks)"));
+ } else {
+ channels_value.set_text (to_string(ms->num_tracks()));
+ }
+ }
+ length_clock.set (ms->length(ms->timeline_position()));
+ switch (ms->num_tempos()) {
+ case 0:
+ tempomap_value.set_text (_("No tempo data"));
+ break;
+ case 1: {
+ Evoral::SMF::Tempo* t = ms->nth_tempo (0);
+ assert (t);
+ tempomap_value.set_text (string_compose (_("%1/%2 \u2669 = %3"),
+ t->numerator,
+ t->denominator,
+ t->tempo ()));
+ break;
+ }
+ default:
+ tempomap_value.set_text (string_compose (_("map with %1 sections"),
+ ms->num_tempos()));
+ break;
+ }
+ } else {
+ channels_value.set_text ("");
+ length_clock.set (0);
+ tempomap_value.set_text (_("No tempo data"));
+ }
+
+ if (_session && ms) {
+ play_btn.set_sensitive (true);
+ } else {
+ play_btn.set_sensitive (false);
+ }
+
+ return true;
+ }
+
if(!AudioFileSource::get_soundfile_info (filename, sf_info, error_msg)) {
preview_label.set_markup (_("<b>Sound File Information</b>"));
return false;
}
- preview_label.set_markup (string_compose ("<b>%1</b>", Glib::path_get_basename (filename)));
+ preview_label.set_markup (string_compose ("<b>%1</b>", Glib::Markup::escape_text (Glib::path_get_basename (filename))));
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));
+ channels_value.set_text (to_string (sf_info.channels));
if (_session && sf_info.samplerate != _session->frame_rate()) {
samplerate.set_markup (string_compose ("<b>%1</b>", _("Sample rate:")));
samplerate.set_name ("NewSessionSR2Label");
}
- nframes_t const nfr = _session ? _session->nominal_frame_rate() : 25;
+ framecnt_t const nfr = _session ? _session->nominal_frame_rate() : 25;
double src_coef = (double) nfr / sf_info.samplerate;
length_clock.set (sf_info.length * src_coef + 0.5, true);
return true;
}
+void
+SoundFileBox::update_autoplay ()
+{
+ const bool config_autoplay = UIConfiguration::instance().get_autoplay_files();
+
+ if (autoplay_btn.get_active() != config_autoplay) {
+ autoplay_btn.set_active (config_autoplay);
+ }
+}
+
+void
+SoundFileBox::autoplay_toggled()
+{
+ UIConfiguration::instance().set_autoplay_files(autoplay_btn.get_active());
+}
+
bool
SoundFileBox::autoplay() const
{
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)) {
}
boost::shared_ptr<Region> r;
- SourceList srclist;
- boost::shared_ptr<AudioFileSource> afs;
- bool old_sbp = AudioSource::get_build_peakfiles ();
- /* don't even think of building peakfiles for these files */
+ if (SMFSource::valid_midi_file (path)) {
- AudioSource::set_build_peakfiles (false);
+ boost::shared_ptr<SMFSource> ms =
+ boost::dynamic_pointer_cast<SMFSource> (
+ SourceFactory::createExternal (DataType::MIDI, *_session,
+ path, 0, Source::Flag (0), false));
- for (int n = 0; n < sf_info.channels; ++n) {
- try {
- afs = boost::dynamic_pointer_cast<AudioFileSource> (
- SourceFactory::createReadable (DataType::AUDIO, *_session,
- path, n, Source::Flag (0), false));
+ string rname = region_name_from_path (ms->path(), false);
+
+ PropertyList plist;
+
+ plist.add (ARDOUR::Properties::start, 0);
+ plist.add (ARDOUR::Properties::length, ms->length(ms->timeline_position()));
+ plist.add (ARDOUR::Properties::name, rname);
+ plist.add (ARDOUR::Properties::layer, 0);
+
+ r = boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (boost::dynamic_pointer_cast<Source>(ms), plist, false));
+ assert(r);
+
+ } else {
- srclist.push_back(afs);
+ SourceList srclist;
+ boost::shared_ptr<AudioFileSource> afs;
+ bool old_sbp = AudioSource::get_build_peakfiles ();
+
+ /* don't even think of building peakfiles for these files */
+
+ AudioSource::set_build_peakfiles (false);
+
+ for (int n = 0; n < sf_info.channels; ++n) {
+ try {
+ afs = boost::dynamic_pointer_cast<AudioFileSource> (
+ SourceFactory::createExternal (DataType::AUDIO, *_session,
+ path, n,
+ Source::Flag (ARDOUR::AudioFileSource::NoPeakFile), false));
+ if (afs->sample_rate() != _session->nominal_frame_rate()) {
+ boost::shared_ptr<SrcFileSource> sfs (new SrcFileSource(*_session, afs, _src_quality));
+ srclist.push_back(sfs);
+ } else {
+ srclist.push_back(afs);
+ }
+
+ } catch (failed_constructor& err) {
+ error << _("Could not access soundfile: ") << path << endmsg;
+ AudioSource::set_build_peakfiles (old_sbp);
+ return;
+ }
+ }
+
+ AudioSource::set_build_peakfiles (old_sbp);
- } catch (failed_constructor& err) {
- error << _("Could not access soundfile: ") << path << endmsg;
- AudioSource::set_build_peakfiles (old_sbp);
+ if (srclist.empty()) {
return;
}
- }
- AudioSource::set_build_peakfiles (old_sbp);
+ afs = boost::dynamic_pointer_cast<AudioFileSource> (srclist[0]);
+ string rname = region_name_from_path (afs->path(), false);
- if (srclist.empty()) {
- return;
+ 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));
}
- afs = boost::dynamic_pointer_cast<AudioFileSource> (srclist[0]);
- string rname = region_name_from_path (afs->path(), 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<AudioRegion> (RegionFactory::create (srclist, plist, false));
+ frameoffset_t audition_position = 0;
+ switch(_import_position) {
+ case ImportAtTimestamp:
+ audition_position = 0;
+ break;
+ case ImportAtPlayhead:
+ audition_position = _session->transport_frame();
+ break;
+ case ImportAtStart:
+ audition_position = _session->current_start_frame();
+ break;
+ case ImportAtEditPoint:
+ audition_position = PublicEditor::instance().get_preferred_edit_position ();
+ break;
+ }
+ r->set_position(audition_position);
_session->audition_region(r);
}
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 (_("Start Downloading")),
- 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)
+ , import_button (_("Import"))
+ , 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");
+#ifdef __APPLE__
+ try {
+ /* add_shortcut_folder throws an exception if the folder being added already has a shortcut */
+ 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");
+ }
+ catch (Glib::Error & e) {
+ std::cerr << "sfdb.add_shortcut_folder() threw Glib::Error " << e.what() << std::endl;
+ }
#endif
+ Gtkmm2ext::add_volume_shortcuts (chooser);
//add the file chooser
- {
- chooser.set_border_width (12);
-
- 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_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));
+
+ 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));
+
+#ifdef __APPLE__
+ /* 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);
+ 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);
+ 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);
+ 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.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.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_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));
+ 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"));
- }
+ notebook.append_page (*vbox, _("Search Tags"));
//add freesound search
-#ifdef FREESOUND
- {
- VBox* vbox;
- HBox* passbox;
- Label* label;
-
- passbox = manage(new HBox);
- passbox->set_border_width (12);
- passbox->set_spacing (6);
-
- label = manage (new Label);
- label->set_text (_("User:"));
- passbox->pack_start (*label, false, false);
- passbox->pack_start (freesound_name_entry);
- label = manage (new Label);
- label->set_text (_("Password:"));
- passbox->pack_start (*label, false, false);
- passbox->pack_start (freesound_pass_entry);
- label = manage (new Label);
- label->set_text (_("Tags:"));
- 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);
-
- 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(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));
- notebook.append_page (*vbox, _("Search Freesound"));
- }
+#ifdef FREESOUND_GOT_FIXED
+
+ 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_start (freesound_similar_btn, false, false);
+ freesound_similar_btn.set_label(_("Similar"));
+ freesound_similar_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 (*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); // filename
+ freesound_list_view.get_column(1)->set_resizable(true); // filename
+ 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.set_tooltip_column(1);
+
+ 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_similar_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_similar_clicked));
+ notebook.append_page (*vbox, _("Search Freesound"));
#endif
-
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)))));
set_session (s);
- add_button (Stock::CANCEL, RESPONSE_CANCEL);
- add_button (Stock::APPLY, RESPONSE_APPLY);
- add_button (Stock::OK, RESPONSE_OK);
+ Gtk::HButtonBox* button_box = manage (new HButtonBox);
+
+ button_box->set_layout (BUTTONBOX_END);
+
+ button_box->pack_start (import_button, false, false);
+ import_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &SoundFileBrowser::do_something), RESPONSE_OK));
+
+ Gtkmm2ext::UI::instance()->set_tip (import_button, _("Press to import selected files"));
+ vpacker.pack_end (*button_box, false, false);
+
+ set_wmclass (X_("import"), PROGRAM_NAME);
}
SoundFileBrowser::~SoundFileBrowser ()
persistent_folder = chooser.get_current_folder();
}
+int
+SoundFileBrowser::run ()
+{
+ set_modal (true);
+ show_all ();
+ present ();
+
+ _done = false;
+
+ while (!_done) {
+ gtk_main_iteration ();
+ }
+
+ return _status;
+}
+
+void
+SoundFileBrowser::set_action_sensitive (bool yn)
+{
+ import_button.set_sensitive (yn);
+}
+
+bool
+SoundFileBrowser::get_action_sensitive () const
+{
+ return import_button.get_sensitive ();
+}
+
+void
+SoundFileBrowser::do_something (int action)
+{
+ _done = true;
+ _status = action;
+}
void
SoundFileBrowser::on_show ()
{
- ArdourDialog::on_show ();
+ ArdourWindow::on_show ();
start_metering ();
}
+bool
+SoundFileBrowser::on_key_press_event (GdkEventKey* ev)
+{
+ if (ev->keyval == GDK_Escape) {
+ do_something (RESPONSE_CLOSE);
+ return true;
+ }
+ if (ev->keyval == GDK_space && ev->type == GDK_KEY_PRESS) {
+ if (get_action_sensitive()) {
+ preview.audition();
+ return true;
+ }
+ }
+ return ArdourWindow::on_key_press_event (ev);
+}
+
void
SoundFileBrowser::clear_selection ()
{
void
SoundFileBrowser::chooser_file_activated ()
{
- preview.audition ();
+ do_something (RESPONSE_OK);
}
void
void
SoundFileBrowser::set_session (Session* s)
{
- ArdourDialog::set_session (s);
+ ArdourWindow::set_session (s);
preview.set_session (s);
if (_session) {
boost::shared_ptr<Route> r = _session->the_auditioner ();
- gm->set_controls (r, r->shared_peak_meter(), r->amp());
+ gm->set_controls (r, r->shared_peak_meter(), r->amp(), r->gain_control());
+ gm->set_fader_name (X_("GainFader"));
meter_packer.set_border_width (12);
meter_packer.pack_start (*gm, false, true);
void
SoundFileBrowser::start_metering ()
{
- metering_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (sigc::mem_fun(*this, &SoundFileBrowser::meter));
+ metering_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &SoundFileBrowser::meter));
}
void
return SMFSource::safe_midi_file_extension (filter_info.filename);
}
+bool
+SoundFileBrowser::on_audio_and_midi_filter (const FileFilter::Info& filter_info)
+{
+ return on_audio_filter (filter_info) || on_midi_filter (filter_info);
+}
+
void
SoundFileBrowser::update_preview ()
{
- if (preview.setup_labels (chooser.get_filename())) {
+ if (preview.setup_labels (chooser.get_preview_filename())) {
if (preview.autoplay()) {
Glib::signal_idle().connect (sigc::mem_fun (preview, &SoundFileBox::audition_oneshot));
}
SoundFileBrowser::found_list_view_selected ()
{
if (!reset_options ()) {
- set_response_sensitive (RESPONSE_OK, false);
+ set_action_sensitive (false);
} else {
string file;
- TreeView::Selection::ListHandle_Path rows = found_list_view.get_selection()->get_selected_rows ();
+ ListPath 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];
chooser.set_filename (file);
- set_response_sensitive (RESPONSE_OK, true);
- } else {
- set_response_sensitive (RESPONSE_OK, false);
- }
-
- preview.setup_labels (file);
- }
-}
-
-void
-SoundFileBrowser::freesound_list_view_selected ()
-{
- if (!reset_options ()) {
- set_response_sensitive (RESPONSE_OK, false);
- } else {
- 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);
+ set_action_sensitive (true);
} else {
- set_response_sensitive (RESPONSE_OK, false);
+ set_action_sensitive (false);
}
preview.setup_labels (file);
}
}
-void*
-freesound_search_thread_entry (void* arg)
+
+std::string
+SoundFileBrowser::freesound_get_audio_file(Gtk::TreeIter iter)
{
- SessionEvent::create_per_thread_pool ("freesound events", 64);
- static_cast<SoundFileBrowser*>(arg)->freesound_search_thread ();
+ Mootcher *mootcher = new Mootcher;
+ std::string file;
- return 0;
-}
+ string id = (*iter)[freesound_list_columns.id];
+ string uri = (*iter)[freesound_list_columns.uri];
+ string ofn = (*iter)[freesound_list_columns.filename];
-bool searching = false;
-bool canceling = false;
+ if (mootcher->checkAudioFile(ofn, id)) {
+ // file already exists, no need to download it again
+ file = mootcher->audioFileName;
+ delete mootcher;
+ (*iter)[freesound_list_columns.started] = false;
+ return file;
+ }
+ if (!(*iter)[freesound_list_columns.started]) {
+ // start downloading the sound file
+ (*iter)[freesound_list_columns.started] = true;
+ mootcher->fetchAudioFile(ofn, id, uri, this);
+ }
+ return "";
+}
void
-SoundFileBrowser::freesound_search_clicked ()
+SoundFileBrowser::freesound_list_view_selected ()
{
- if (canceling) //already canceling, button does nothing
- return;
- if ( searching ) {
- freesound_search_btn.set_label(_("Cancelling.."));
- canceling = true;
+ if (!reset_options ()) {
+ set_action_sensitive (false);
} 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);
+ std::string file;
+ ListPath rows = freesound_list_view.get_selection()->get_selected_rows ();
+ for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) {
+ file = freesound_get_audio_file (freesound_list->get_iter(*i));
+ }
+
+ switch (rows.size()) {
+ case 0:
+ // nothing selected
+ freesound_similar_btn.set_sensitive(false);
+ set_action_sensitive (false);
+ break;
+ case 1:
+ // exactly one item selected
+ if (file != "") {
+ // file exists on disk already
+ chooser.set_filename (file);
+ preview.setup_labels (file);
+ set_action_sensitive (true);
+ }
+ freesound_similar_btn.set_sensitive(true);
+ break;
+ default:
+ // multiple items selected
+ preview.setup_labels ("");
+ freesound_similar_btn.set_sensitive(false);
+ break;
+ }
+
}
}
void
-SoundFileBrowser::freesound_search_thread()
+SoundFileBrowser::refresh_display(std::string ID, std::string file)
{
-#if 0
-
- THIS IS ALL TOTALLY THREAD-ILLEGAL ... YOU CANNOT DO GTK STUFF IN THIS THREAD
+ // called when the mootcher has finished downloading a file
+ ListPath rows = freesound_list_view.get_selection()->get_selected_rows ();
+ if (rows.size() == 1) {
+ // there's a single item selected in the freesound list
+ //XXX make a function to be used to construct the actual file name both here and in the mootcher
+ Gtk::TreeIter row = freesound_list->get_iter(*rows.begin());
+ std::string selected_ID = (*row)[freesound_list_columns.id];
+ if (ID == selected_ID) {
+ // the selected item in the freesound list is the item that has just finished downloading
+ chooser.set_filename(file);
+ preview.setup_labels (file);
+ set_action_sensitive (true);
+ }
+ }
+}
-#ifdef FREESOUND
+void
+SoundFileBrowser::freesound_search_clicked ()
+{
+ freesound_page = 1;
freesound_list->clear();
+ matches = 0;
+ freesound_search();
+}
- string path;
- path = Glib::get_home_dir();
- path += "/Freesound/";
- Mootcher theMootcher(path.c_str());
+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_similar_clicked ()
+{
+ ListPath rows = freesound_list_view.get_selection()->get_selected_rows ();
+ if (rows.size() == 1) {
+ Mootcher mootcher;
+ string id;
+ Gtk::TreeIter iter = freesound_list->get_iter(*rows.begin());
+ id = (*iter)[freesound_list_columns.id];
+ freesound_list->clear();
+
+ 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();
+
+ std::string theString = mootcher.searchSimilar(id);
+
+ gdk_window_set_cursor (get_window()->gobj(), prev_cursor);
+ handle_freesound_results(theString);
+ }
+}
+
+void
+SoundFileBrowser::freesound_search()
+{
+ Mootcher mootcher;
- 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();
+
+ 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();
+
+ std::string theString = mootcher.searchText(
+ search_string,
+ freesound_page,
+#ifdef __APPLE__
+ "", // 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
+ );
- if ( theMootcher.doLogin( name_string, pass_string ) ) {
+ gdk_window_set_cursor (get_window()->gobj(), prev_cursor);
+ handle_freesound_results(theString);
+}
- string theString = theMootcher.searchText(search_string);
+void
+SoundFileBrowser::handle_freesound_results(std::string theString) {
+ XMLTree doc;
+ doc.read_buffer( theString );
+ XMLNode *root = doc.root();
- XMLTree doc;
- doc.read_buffer( theString );
- XMLNode *root = doc.root();
+ if (!root) {
+ error << "no root XML node!" << endmsg;
+ return;
+ }
- if (root==NULL) return;
+ if ( strcmp(root->name().c_str(), "response") != 0) {
+ error << string_compose ("root node name == %1 != \"response\"", root->name()) << endmsg;
+ return;
+ }
- if ( strcmp(root->name().c_str(), "freesound") == 0) {
+ // 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);
+ }
- 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;
- }
- }
- }
- }
+ 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"));
}
- searching = false;
- canceling = false;
- freesound_search_btn.set_label(_("Start Downloading"));
-#endif
-#endif
+ 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;
+ }
+
+ // 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);
+ 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);
+ 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"));
+ }
+
+ /* 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';
+ }
+ 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++;
+ }
+ }
}
vector<string>
vector<string>::iterator i;
for (i = filenames.begin(); i != filenames.end(); ++i) {
- struct stat buf;
- if ((!stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) {
+ GStatBuf buf;
+ if ((!g_stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) {
results.push_back (*i);
}
}
- } else if (n==1){
-
- typedef TreeView::Selection::ListHandle_Path ListPath;
+ } else if (n == 1) {
ListPath rows = found_list_view.get_selection()->get_selected_rows ();
for (ListPath::iterator i = rows.begin() ; i != rows.end(); ++i) {
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);
- string str = (*iter)[freesound_list_columns.pathname];
-
- results.push_back (str);
+ string str = freesound_get_audio_file (freesound_list->get_iter(*i));
+ if (str != "") {
+ results.push_back (str);
+ }
}
}
bool
SoundFileOmega::reset_options ()
{
+ if (_import_active) {
+ _reset_post_import = true;
+ return true;
+ }
+
vector<string> paths = get_paths ();
if (paths.empty()) {
channel_combo.set_sensitive (false);
action_combo.set_sensitive (false);
where_combo.set_sensitive (false);
+ copy_files_btn.set_active (true);
copy_files_btn.set_sensitive (false);
return false;
/* if we get through this function successfully, this may be
reset at the end, once we know if we can use hard links
- to do embedding
+ to do embedding (or if we are importing a MIDI file).
*/
- if (Config->get_only_copy_imported_files()) {
+ if (UIConfiguration::instance().get_only_copy_imported_files()) {
copy_files_btn.set_sensitive (false);
} else {
copy_files_btn.set_sensitive (false);
bool selection_can_be_embedded_with_links = check_link_status (_session, paths);
ImportMode mode;
+ /* See if we are thinking about importing any MIDI files */
+ vector<string>::iterator i = paths.begin ();
+ while (i != paths.end() && SMFSource::valid_midi_file (*i) == false) {
+ ++i;
+ }
+ bool const have_a_midi_file = (i != paths.end ());
+
if (check_info (paths, same_size, src_needed, selection_includes_multichannel)) {
Glib::signal_idle().connect (sigc::mem_fun (*this, &SoundFileOmega::bad_file_message));
return false;
}
+ if (have_a_midi_file) {
+ smf_tempo_btn.show ();
+ } else {
+ smf_tempo_btn.hide ();
+ }
+
string existing_choice;
vector<string> action_strings;
- if (selected_track_cnt > 0) {
- if (channel_combo.get_active_text().length()) {
- ImportDisposition id = get_channel_disposition();
+ resetting_ourselves = true;
+
+ 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 ONLY */
+
+ if (selected_midi_track_cnt > 0) {
+ action_strings.push_back (importmode2string (ImportToTrack));
}
}
action_strings.push_back (importmode2string (ImportAsTrack));
action_strings.push_back (importmode2string (ImportAsRegion));
- action_strings.push_back (importmode2string (ImportAsTapeTrack));
-
- resetting_ourselves = true;
+ if (!Profile->get_mixbus()) {
+ action_strings.push_back (importmode2string (ImportAsTapeTrack));
+ }
existing_choice = action_combo.get_active_text();
vector<string> channel_strings;
if (mode == ImportAsTrack || mode == ImportAsTapeTrack || mode == ImportToTrack) {
- channel_strings.push_back (_("one track per file"));
if (selection_includes_multichannel) {
channel_strings.push_back (_("one track per channel"));
}
+ channel_strings.push_back (_("one track per file"));
+
if (paths.size() > 1) {
/* tape tracks are a single region per track, so we cannot
sequence multiple files.
src_combo.set_sensitive (false);
}
- if (Config->get_only_copy_imported_files()) {
+ /* 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 (selection_can_be_embedded_with_links) {
+ if (UIConfiguration::instance().get_only_copy_imported_files()) {
+
+ if (selection_can_be_embedded_with_links && !must_copy) {
copy_files_btn.set_sensitive (true);
} else {
+ if (must_copy) {
+ copy_files_btn.set_active (true);
+ }
copy_files_btn.set_sensitive (false);
}
} else {
- copy_files_btn.set_sensitive (true);
+ if (must_copy) {
+ copy_files_btn.set_active (true);
+ }
+ copy_files_btn.set_sensitive (!must_copy);
}
return true;
SoundFileOmega::check_info (const vector<string>& paths, bool& same_size, bool& src_needed, bool& multichannel)
{
SoundFileInfo info;
- nframes64_t sz = 0;
+ framepos_t sz = 0;
bool err = false;
string errmsg;
}
}
- if ((nframes_t) info.samplerate != _session->frame_rate()) {
+ if (info.samplerate != _session->frame_rate()) {
src_needed = true;
}
- } else if (SMFSource::safe_midi_file_extension (*i)) {
+ } else if (SMFSource::valid_midi_file (*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
- we can't check the file
- */
+ if (reader.open (*i)) {
+ err = true;
+ } else {
+ if (reader.is_type0 ()) {
+ if (reader.channels().size() > 1) {
+ /* for type-0 files, we can split
+ * "one track per channel"
+ */
+ multichannel = true;
+ }
+ } else {
+ if (reader.num_tracks() > 1) {
+ multichannel = true;
+ }
+ }
+ }
} else {
err = true;
bool
SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths)
{
- sys::path path = s->session_directory().sound_path() / "linktest";
- string tmpdir = path.to_string();
+#ifdef PLATFORM_WINDOWS
+ return false;
+#else
+ std::string tmpdir(Glib::build_filename (s->session_directory().sound_path(), "linktest"));
bool ret = false;
- if (mkdir (tmpdir.c_str(), 0744)) {
+ if (g_mkdir (tmpdir.c_str(), 0744)) {
if (errno != EEXIST) {
return false;
}
for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
- char tmpc[MAXPATHLEN+1];
+ char tmpc[PATH_MAX+1];
snprintf (tmpc, sizeof(tmpc), "%s/%s", tmpdir.c_str(), Glib::path_get_basename (*i).c_str());
goto out;
}
- unlink (tmpc);
+ ::g_unlink (tmpc);
}
ret = true;
out:
- rmdir (tmpdir.c_str());
+ g_rmdir (tmpdir.c_str());
return ret;
+#endif
}
-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);
void
SoundFileChooser::on_hide ()
{
- ArdourDialog::on_hide();
+ ArdourWindow::on_hide();
stop_metering ();
if (_session) {
return paths.front();
}
-SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Session* s, int selected_tracks, bool persistent,
+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),
- copy_files_btn ( _("Copy files to session")),
- selected_track_cnt (selected_tracks)
+ : SoundFileBrowser (title, s, persistent)
+ , copy_files_btn ( _("Copy files to session"))
+ , smf_tempo_btn (_("Use MIDI Tempo Map (if defined)"))
+ , selected_audio_track_cnt (selected_audio_tracks)
+ , selected_midi_track_cnt (selected_midi_tracks)
+ , _import_active (false)
+ , _reset_post_import (false)
{
- VBox* vbox;
- HBox* hbox;
vector<string> str;
- set_size_request (-1, 450);
+ set_size_request (-1, 550);
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 (_("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());
+ where_combo.set_active_text (str.back());
+ where_combo.signal_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::where_combo_changed));
Label* l = manage (new Label);
- l->set_text (_("Add files:"));
-
- hbox = manage (new HBox);
- hbox->set_border_width (12);
- hbox->set_spacing (6);
- hbox->pack_start (*l, false, false);
- hbox->pack_start (action_combo, false, false);
- vbox = manage (new VBox);
- 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
- come up with no tracks selected.
- */
+ l->set_markup (_("<b>Add files ...</b>"));
+ options.attach (*l, 0, 1, 0, 1, FILL, SHRINK, 8, 0);
+ options.attach (action_combo, 0, 1, 1, 2, FILL, SHRINK, 8, 0);
- str.clear ();
- str.push_back (importmode2string (mode_hint));
- set_popdown_strings (action_combo, str);
- action_combo.set_active_text (str.front());
- action_combo.set_sensitive (false);
+ l = manage (new Label);
+ l->set_markup (_("<b>Insert at</b>"));
+ options.attach (*l, 0, 1, 3, 4, FILL, SHRINK, 8, 0);
+ options.attach (where_combo, 0, 1, 4, 5, FILL, SHRINK, 8, 0);
l = manage (new Label);
- l->set_text (_("Insert at:"));
+ l->set_markup (_("<b>Mapping</b>"));
+ options.attach (*l, 1, 2, 0, 1, FILL, SHRINK, 8, 0);
+ options.attach (channel_combo, 1, 2, 1, 2, FILL, SHRINK, 8, 0);
- hbox = manage (new HBox);
- hbox->set_border_width (12);
- hbox->set_spacing (6);
- hbox->pack_start (*l, false, false);
- hbox->pack_start (where_combo, false, false);
- vbox = manage (new VBox);
- vbox->pack_start (*hbox, false, false);
- options.pack_start (*vbox, false, false);
+ l = manage (new Label);
+ l->set_markup (_("<b>Conversion quality</b>"));
+ options.attach (*l, 1, 2, 3, 4, FILL, SHRINK, 8, 0);
+ options.attach (src_combo, 1, 2, 4, 5, FILL, SHRINK, 8, 0);
+
+ l = manage (new Label);
+ l->set_markup (_("<b>MIDI Track Names</b>"));
+ options.attach (*l, 2, 3, 0, 1, FILL, SHRINK, 8, 0);
+ options.attach (midi_track_name_combo, 2, 3, 1, 2, FILL, SHRINK, 8, 0);
+ options.attach (smf_tempo_btn, 2, 3, 3, 4, FILL, SHRINK, 8, 0);
l = manage (new Label);
- l->set_text (_("Mapping:"));
+ l->set_markup (_("<b>Instrument</b>"));
+ options.attach (*l, 3, 4, 0, 1, FILL, SHRINK, 8, 0);
+ options.attach (instrument_combo, 3, 4, 1, 2, FILL, SHRINK, 8, 0);
+
+ Alignment *hspace = manage (new Alignment ());
+ hspace->set_size_request (2, 2);
+ options.attach (*hspace, 0, 3, 2, 3, FILL, SHRINK, 0, 8);
+
+ Alignment *vspace = manage (new Alignment ());
+ vspace->set_size_request (2, 2);
+ options.attach (*vspace, 2, 3, 0, 3, EXPAND, SHRINK, 0, 0);
- hbox = manage (new HBox);
- hbox->set_border_width (12);
- hbox->set_spacing (6);
- hbox->pack_start (*l, false, false);
- hbox->pack_start (channel_combo, false, false);
- vbox = manage (new VBox);
- vbox->pack_start (*hbox, false, false);
- options.pack_start (*vbox, false, false);
+ str.clear ();
+ str.push_back (_("by track number"));
+ str.push_back (_("by track name"));
+ str.push_back (_("by instrument name"));
+ set_popdown_strings (midi_track_name_combo, str);
+ midi_track_name_combo.set_active_text (str.front());
str.clear ();
str.push_back (_("one track per file"));
channel_combo.set_active_text (str.front());
channel_combo.set_sensitive (false);
- l = manage (new Label);
- l->set_text (_("Conversion quality:"));
-
- hbox = manage (new HBox);
- hbox->set_border_width (12);
- hbox->set_spacing (6);
- hbox->pack_start (*l, false, false);
- hbox->pack_start (src_combo, false, false);
- vbox = manage (new VBox);
- vbox->pack_start (*hbox, false, false);
- options.pack_start (*vbox, false, false);
-
str.clear ();
str.push_back (_("Best"));
str.push_back (_("Good"));
set_popdown_strings (src_combo, str);
src_combo.set_active_text (str.front());
src_combo.set_sensitive (false);
-
- reset_options ();
+ src_combo.signal_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::src_combo_changed));
action_combo.signal_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::reset_options_noret));
channel_combo.signal_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::reset_options_noret));
copy_files_btn.set_active (true);
- block_four.pack_start (copy_files_btn, false, false);
+ Gtk::Label* copy_label = dynamic_cast<Gtk::Label*>(copy_files_btn.get_child());
- options.pack_start (block_four, false, false);
+ if (copy_label) {
+ copy_label->set_size_request (175, -1);
+ copy_label->set_line_wrap (true);
+ }
- get_vbox()->pack_start (options, false, false);
+ block_four.pack_start (copy_files_btn, false, false);
+ options.attach (block_four, 3, 4, 4, 5, FILL, SHRINK, 8, 0);
+
+ vpacker.pack_start (options, false, true);
/* setup disposition map */
selects a file to import, which in turn prevents the size of the dialog from jumping
around. */
- vector<string> 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);
+ str.clear ();
+ str.push_back (_("one track per file"));
+ str.push_back (_("one track per channel"));
+ str.push_back (_("sequence files"));
+ str.push_back (_("all files in one region"));
+ set_popdown_strings (channel_combo, str);
+
+ str.clear ();
+ str.push_back (importmode2string (ImportAsTrack));
+ str.push_back (importmode2string (ImportToTrack));
+ str.push_back (importmode2string (ImportAsRegion));
+ str.push_back (importmode2string (ImportAsTapeTrack));
+ set_popdown_strings (action_combo, str);
+ action_combo.set_active_text (importmode2string(mode_hint));
- 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);
+ reset (selected_audio_tracks, selected_midi_tracks);
}
void
void
SoundFileOmega::on_hide ()
{
- ArdourDialog::on_hide();
+ ArdourWindow::on_hide();
if (_session) {
_session->cancel_audition();
}
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;
}
}
+void
+SoundFileOmega::src_combo_changed()
+{
+ preview.set_src_quality(get_src_quality());
+}
+
+void
+SoundFileOmega::where_combo_changed()
+{
+ preview.set_import_position(get_position());
+}
+
+MidiTrackNameSource
+SoundFileOmega::get_midi_track_name_source () const
+{
+ return string2miditracknamesource (midi_track_name_combo.get_active_text());
+}
+
+bool
+SoundFileOmega::get_use_smf_tempo_map () const
+{
+ return smf_tempo_btn.get_active ();
+}
+
ImportDisposition
SoundFileOmega::get_channel_disposition () const
{
if (x == disposition_map.end()) {
fatal << string_compose (_("programming error: %1 (%2)"), "unknown string for import disposition", str) << endmsg;
- /*NOTREACHED*/
+ abort(); /*NOTREACHED*/
}
return x->second;
}
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;
+
+ if (selected_audio_track_cnt == 0 && selected_midi_track_cnt > 0) {
+ chooser.set_filter (midi_filter);
+ } else if (selected_midi_track_cnt == 0 && selected_audio_track_cnt > 0) {
+ chooser.set_filter (audio_filter);
+ } else {
+ chooser.set_filter (audio_and_midi_filter);
+ }
+
reset_options ();
}
}
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_CLOSE) {
+ hide ();
+ return;
+ }
+
+ /* lets do it */
+
+ vector<string> paths = get_paths ();
+ ImportPosition pos = get_position ();
+ ImportMode mode = get_mode ();
+ ImportDisposition chns = get_channel_disposition ();
+ PluginInfoPtr instrument = instrument_combo.selected_instrument();
+ framepos_t where;
+ MidiTrackNameSource mts = get_midi_track_name_source ();
+ MidiTempoMapDisposition mtd = (get_use_smf_tempo_map () ? SMFTempoUse : SMFTempoIgnore);
+
+ 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();
+
+ _import_active = true;
+
+ if (copy_files_btn.get_active()) {
+ PublicEditor::instance().do_import (paths, chns, mode, quality, mts, mtd, where, instrument);
+ } else {
+ PublicEditor::instance().do_embed (paths, chns, mode, where, instrument);
+ }
+
+ _import_active = false;
+
+ if (_reset_post_import) {
+ _reset_post_import = false;
+ reset_options ();
+ }
+}