#include <gtkmm/stock.h>
#include <glibmm/fileutils.h>
-#include <pbd/convert.h>
-#include <pbd/tokenizer.h>
-#include <pbd/enumwriter.h>
+#include "pbd/convert.h"
+#include "pbd/tokenizer.h"
+#include "pbd/enumwriter.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/xml++.h"
#include <gtkmm2ext/utils.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/smf_reader.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 "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"
#include "utils.h"
#include "gain_meter.h"
+#ifdef FREESOUND
+#include "sfdb_freesound_mootcher.h"
+#endif
+
#include "i18n.h"
using namespace ARDOUR;
static ImportMode
string2importmode (string str)
{
- if (str == "as new tracks") {
+ if (str == _("as new tracks")) {
return ImportAsTrack;
- } else if (str == "to selected tracks") {
+ } else if (str == _("to selected tracks")) {
return ImportToTrack;
- } else if (str == "to region list") {
+ } else if (str == _("to region list")) {
return ImportAsRegion;
- } else if (str == "as new tape tracks") {
+ } else if (str == _("as new tape tracks")) {
return ImportAsTapeTrack;
}
autoplay_btn (_("Auto-play"))
{
- HBox* hbox;
- VBox* vbox;
-
set_name (X_("SoundFileBox"));
set_size_request (300, -1);
- preview_label.set_markup (_("<b>Soundfile Info</b>"));
+ preview_label.set_markup (_("<b>Sound File Information</b>"));
border_frame.set_label_widget (preview_label);
border_frame.add (main_box);
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);
- 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);
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(*vbox, true, true);
- main_box.pack_start(bottom_box, false, false);
+ 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"));
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);
-
channels_value.set_alignment (0.0f, 0.5f);
samplerate_value.set_alignment (0.0f, 0.5f);
}
if(!AudioFileSource::get_soundfile_info (filename, sf_info, error_msg)) {
- preview_label.set_markup (_("<b>Soundfile Info</b>"));
- format_text.set_text (_("n/a"));
- channels_value.set_text (_("n/a"));
- samplerate_value.set_text (_("n/a"));
+ preview_label.set_markup (_("<b>Sound File Information</b>"));
+ format_text.set_text ("");
+ channels_value.set_text ("");
+ samplerate_value.set_text ("");
tags_entry.get_buffer()->set_text ("");
length_clock.set (0);
}
preview_label.set_markup (string_compose ("<b>%1</b>", 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()) {
samplerate.set_name ("NewSessionSR2Label");
}
- length_clock.set (sf_info.length, true);
- timecode_clock.set (sf_info.timecode, true);
+ 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);
// this is a hack that is fixed in trunk, i think (august 26th, 2007)
for (int n = 0; n < sf_info.channels; ++n) {
try {
- afs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable (DataType::AUDIO, *_session, path,
- n, AudioFileSource::Flag (0), false));
+ afs = boost::dynamic_pointer_cast<AudioFileSource> (
+ SourceFactory::createReadable (DataType::AUDIO, *_session,
+ path, false, n, Source::Flag (0), false));
srclist.push_back(afs);
afs = boost::dynamic_pointer_cast<AudioFileSource> (srclist[0]);
string rname = region_name_from_path (afs->path(), false);
- r = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (srclist, 0, srclist[0]->length(), rname, 0, Region::DefaultFlags, false));
+ r = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (srclist, 0,
+ srclist[0]->length(srclist[0]->timeline_position()),
+ rname, 0, Region::DefaultFlags, false));
_session->audition_region(r);
}
}
bool
-SoundFileBox::tags_entry_left (GdkEventFocus *ev)
+SoundFileBox::tags_entry_left (GdkEventFocus *)
{
tags_changed ();
return false;
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),
- found_list_view (found_list),
preview (persistent),
- found_search_btn (_("Search"))
-
+ found_search_btn (_("Search")),
+ found_list_view (found_list),
+ freesound_search_btn (_("Start Downloading")),
+ freesound_list_view (freesound_list)
{
+ resetting_ourselves = false;
+ gm = 0;
+
+ resetting_ourselves = false;
+ gm = 0;
+
if (ARDOUR::Profile->get_sae()) {
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");
}
- VBox* vbox;
- HBox* hbox;
- gm = 0;
+ //add the file chooser
+ {
+ chooser.set_border_width (12);
- set_session (s);
- resetting_ourselves = false;
+ audio_filter.add_custom (FILE_FILTER_FILENAME, 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.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(mem_fun(*this, &SoundFileBrowser::update_preview));
+ chooser.signal_file_activated().connect (mem_fun (*this, &SoundFileBrowser::chooser_file_activated));
+
+ 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);
-
- hbox = manage(new HBox);
- hbox->pack_start (found_entry);
- hbox->pack_start (found_search_btn);
- vbox = manage(new VBox);
- vbox->pack_start (*hbox, PACK_SHRINK);
- vbox->pack_start (found_list_view);
- found_list_view.append_column(_("Paths"), found_list_columns.pathname);
+ get_vbox()->pack_start (hpacker, true, true);
- chooser.set_border_width (12);
+ //add tag search
+ {
+ VBox* vbox;
+ HBox* hbox;
- notebook.append_page (chooser, _("Browse Files"));
- notebook.append_page (*vbox, _("Search Tags"));
- notebook.set_size_request (500, -1);
-
- found_list_view.get_selection()->set_mode (SELECTION_MULTIPLE);
- found_list_view.signal_row_activated().connect (mem_fun (*this, &SoundFileBrowser::found_list_view_activated));
+ 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);
- audio_filter.add_custom (FILE_FILTER_FILENAME, 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.set_name (_("MIDI files"));
+ vbox = manage(new VBox);
+ vbox->pack_start (*hbox, PACK_SHRINK);
+ vbox->pack_start (*scroll);
+
+ found_list_view.append_column(_("Paths"), found_list_columns.pathname);
- matchall_filter.add_pattern ("*.*");
- matchall_filter.set_name (_("All files"));
+ 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));
- 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(mem_fun(*this, &SoundFileBrowser::update_preview));
- chooser.signal_file_activated().connect (mem_fun (*this, &SoundFileBrowser::chooser_file_activated));
+ 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));
- if (!persistent_folder.empty()) {
- chooser.set_current_folder (persistent_folder);
+ notebook.append_page (*vbox, _("Search Tags"));
}
- found_list_view.get_selection()->signal_changed().connect(mem_fun(*this, &SoundFileBrowser::found_list_view_selected));
+ //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(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));
+ notebook.append_page (*vbox, _("Search Freesound"));
+ }
+#endif
- 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));
+
+ notebook.set_size_request (500, -1);
+
+ set_session (s);
add_button (Stock::CANCEL, RESPONSE_CANCEL);
add_button (Stock::APPLY, RESPONSE_APPLY);
}
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&, TreeViewColumn*)
{
preview.audition ();
}
void
SoundFileBrowser::add_gain_meter ()
{
- if (gm) {
- delete gm;
- }
+ delete gm;
- gm = new GainMeter (session->the_auditioner(), *session);
+ gm = new GainMeter (*session);
+
+ boost::shared_ptr<Route> 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);
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
}
}
+void
+SoundFileBrowser::freesound_list_view_selected ()
+{
+ if (!reset_options ()) {
+ set_response_sensitive (RESPONSE_OK, false);
+ } else {
+ 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];
+ chooser.set_filename (file);
+ set_response_sensitive (RESPONSE_OK, true);
+ } else {
+ set_response_sensitive (RESPONSE_OK, false);
+ }
+
+ preview.setup_labels (file);
+ }
+}
+
void
SoundFileBrowser::found_search_clicked ()
{
}
}
+void*
+freesound_search_thread_entry (void* arg)
+{
+ PBD::notify_gui_about_thread_creation (pthread_self(), X_("Freesound Search"));
+
+ 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, 0, freesound_search_thread_entry, this);
+ }
+}
+
+void
+SoundFileBrowser::freesound_search_thread()
+{
+#ifdef FREESOUND
+ freesound_list->clear();
+
+ string path;
+ 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 ();
+
+ if ( theMootcher.doLogin( name_string, pass_string ) ) {
+
+ string theString = theMootcher.searchText(search_string);
+
+ XMLTree doc;
+ doc.read_buffer( theString );
+ XMLNode *root = doc.root();
+
+ if (root==NULL) return;
+
+ if ( strcmp(root->name().c_str(), "freesound") == 0) {
+
+ 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;
+ }
+ }
+ }
+ }
+ }
+
+ searching = false;
+ canceling = false;
+ freesound_search_btn.set_label(_("Start Downloading"));
+#endif
+}
+
vector<ustring>
SoundFileBrowser::get_paths ()
{
}
}
- } else {
+ } else if (n==1){
typedef TreeView::Selection::ListHandle_Path ListPath;
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);
}
}
bool
SoundFileOmega::check_info (const vector<ustring>& paths, bool& same_size, bool& src_needed, bool& multichannel)
{
- SNDFILE* sf;
- SF_INFO info;
+ SoundFileInfo info;
nframes64_t sz = 0;
bool err = false;
+ string errmsg;
same_size = true;
src_needed = false;
for (vector<ustring>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
- info.format = 0; // libsndfile says to clear this before sf_open().
-
- if ((sf = sf_open ((char*) (*i).c_str(), SFM_READ, &info)) != 0) {
- sf_close (sf);
-
+ if (AudioFileSource::get_soundfile_info (*i, info, errmsg)) {
if (info.channels > 1) {
multichannel = true;
}
-
if (sz == 0) {
- sz = info.frames;
+ sz = info.length;
} else {
- if (sz != info.frames) {
+ if (sz != info.length) {
same_size = false;
}
}
src_needed = true;
}
- } else if (SMFSource::safe_file_extension (*i)) {
- SMFReader reader(*i);
+ } else if (SMFSource::safe_midi_file_extension (*i)) {
+
+ Evoral::SMF reader;
+ reader.open(*i);
if (reader.num_tracks() > 1) {
- cout << *i << " MULTI CHANNEL" << endl;
- multichannel = true;
- } else {
- cout << *i << " SINGLE CHANNEL" << endl;
+ multichannel = true; // "channel" == track here...
}
+
+ /* XXX we need err = true handling here in case
+ we can't check the file
+ */
+
} else {
err = true;
}
{
chooser.set_select_multiple (false);
found_list_view.get_selection()->set_mode (SELECTION_SINGLE);
+ freesound_list_view.get_selection()->set_mode (SELECTION_SINGLE);
}
void
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());
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);
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);
disposition_map.insert (pair<ustring,ImportDisposition>(_("all files in one region"), ImportMergeFiles));
chooser.signal_selection_changed().connect (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<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);
+
+ 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
{
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;
projects / ardour.git / blobdiff