*/
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
#include <map>
#include <cerrno>
#include <sstream>
#include "evoral/SMF.hpp"
-#include "ardour/amp.h"
#include "ardour/audio_library.h"
#include "ardour/auditioner.h"
#include "ardour/audioregion.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 "editing.h"
#include "utils.h"
#include "gain_meter.h"
+#include "main_clock.h"
#ifdef FREESOUND
#include "sfdb_freesound_mootcher.h"
using namespace Gtkmm2ext;
using namespace Editing;
-using Glib::ustring;
+using std::string;
-ustring SoundFileBrowser::persistent_folder;
+string SoundFileBrowser::persistent_folder;
static ImportMode
string2importmode (string str)
SoundFileBox::SoundFileBox (bool persistent)
: table (6, 2),
- length_clock ("sfboxLengthClock", !persistent, "EditCursorClock", false, false, true, false),
- timecode_clock ("sfboxTimecodeClock", !persistent, "EditCursorClock", false, false, false, false),
+ length_clock ("sfboxLengthClock", !persistent, "", false, false, true, false),
+ timecode_clock ("sfboxTimecodeClock", !persistent, "", false, false, false, false),
main_box (false, 6),
autoplay_btn (_("Auto-play"))
samplerate.set_text (_("Sample rate:"));
samplerate.set_alignment (1, 0.5);
- format_text.set_max_width_chars (8);
+ preview_label.set_max_width_chars (50);
+ preview_label.set_ellipsize (Pango::ELLIPSIZE_END);
+
+ format_text.set_max_width_chars (20);
format_text.set_ellipsize (Pango::ELLIPSIZE_END);
format_text.set_alignment (0, 1);
table.attach (length_clock, 1, 2, 4, 5, FILL, FILL);
table.attach (timecode_clock, 1, 2, 5, 6, FILL, FILL);
- length_clock.set_mode (ARDOUR_UI::instance()->secondary_clock.mode());
+ length_clock.set_mode (ARDOUR_UI::instance()->secondary_clock->mode());
timecode_clock.set_mode (AudioClock::Timecode);
main_box.pack_start (table, false, false);
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);
}
bool
-SoundFileBox::setup_labels (const ustring& filename)
+SoundFileBox::setup_labels (const string& filename)
{
if (!path.empty()) {
// save existing tags
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);
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);
afs = boost::dynamic_pointer_cast<AudioFileSource> (srclist[0]);
string rname = region_name_from_path (afs->path(), false);
-
- PropertyList plist;
-
+
+ PropertyList plist;
+
plist.add (ARDOUR::Properties::start, 0);
plist.add (ARDOUR::Properties::length, srclist[0]->length(srclist[0]->timeline_position()));
plist.add (ARDOUR::Properties::name, rname);
plist.add (ARDOUR::Properties::layer, 0);
-
+
r = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (srclist, plist, false));
_session->audition_region(r);
preview (persistent),
found_search_btn (_("Search")),
found_list_view (found_list),
- freesound_search_btn (_("Start Downloading")),
+ freesound_search_btn (_("Search")),
freesound_list_view (freesound_list)
{
resetting_ourselves = false;
chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops");
chooser.add_shortcut_folder_uri("file:///Library/Audio/Apple Loops");
chooser.add_shortcut_folder_uri("file:///Library/Application Support/GarageBand/Instrument Library/Sampler/Sampler Files");
-
+
chooser.add_shortcut_folder_uri("file:///Volumes");
#endif
+#ifdef FREESOUND
+ mootcher = new Mootcher();
+#endif
+
//add the file chooser
{
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"));
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);
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));
+ freesound_stop_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_stop_clicked));
+
notebook.append_page (*vbox, _("Search Tags"));
}
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);
+ 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_progress_bar);
+ passbox->pack_end (freesound_stop_btn, false, false);
+ freesound_stop_btn.set_label(_("Stop"));
+
Gtk::ScrolledWindow *scroll = manage(new ScrolledWindow);
scroll->add(freesound_list_view);
scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
vbox = manage(new VBox);
vbox->pack_start (*passbox, PACK_SHRINK);
- vbox->pack_start(*scroll);
+ vbox->pack_start (*scroll);
- //vbox->pack_start (freesound_list_view);
+ 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.get_column(1)->set_expand(true);
- 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.get_selection()->set_mode (SELECTION_MULTIPLE);
freesound_list_view.signal_row_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::freesound_list_view_activated));
freesound_search_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_search_clicked));
freesound_entry.signal_activate().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_search_clicked));
+ freesound_stop_btn.signal_clicked().connect(sigc::mem_fun(*this, &SoundFileBrowser::freesound_stop_clicked));
notebook.append_page (*vbox, _("Search Freesound"));
}
+
#endif
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);
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));
}
if (!reset_options ()) {
set_response_sensitive (RESPONSE_OK, false);
} else {
- ustring file;
+ string file;
TreeView::Selection::ListHandle_Path rows = found_list_view.get_selection()->get_selected_rows ();
void
SoundFileBrowser::freesound_list_view_selected ()
{
+ freesound_download_cancel = false;
+
+#ifdef FREESOUND
if (!reset_options ()) {
set_response_sensitive (RESPONSE_OK, false);
} else {
- ustring file;
+
+ string file;
TreeView::Selection::ListHandle_Path rows = freesound_list_view.get_selection()->get_selected_rows ();
if (!rows.empty()) {
TreeIter iter = freesound_list->get_iter(*rows.begin());
- file = (*iter)[freesound_list_columns.pathname];
- chooser.set_filename (file);
- set_response_sensitive (RESPONSE_OK, true);
+
+ string id = (*iter)[freesound_list_columns.id];
+ string uri = (*iter)[freesound_list_columns.uri];
+ string ofn = (*iter)[freesound_list_columns.filename];
+
+ // download the sound file
+ GdkCursor *prev_cursor;
+ prev_cursor = gdk_window_get_cursor (get_window()->gobj());
+ gdk_window_set_cursor (get_window()->gobj(), gdk_cursor_new(GDK_WATCH));
+ gdk_flush();
+
+ file = mootcher->getAudioFile(ofn, id, uri, this);
+
+ gdk_window_set_cursor (get_window()->gobj(), prev_cursor);
+
+ if (file != "") {
+ chooser.set_filename (file);
+ set_response_sensitive (RESPONSE_OK, true);
+ }
} else {
set_response_sensitive (RESPONSE_OK, false);
}
preview.setup_labels (file);
}
+#endif
}
void
}
}
-void*
-freesound_search_thread_entry (void* arg)
-{
- SessionEvent::create_per_thread_pool ("freesound events", 64);
-
- static_cast<SoundFileBrowser*>(arg)->freesound_search_thread ();
-
- return 0;
-}
-
-bool searching = false;
-bool canceling = false;
-
void
SoundFileBrowser::freesound_search_clicked ()
{
- if (canceling) //already canceling, button does nothing
- return;
-
- if ( searching ) {
- freesound_search_btn.set_label(_("Cancelling.."));
- canceling = true;
- } else {
- searching = true;
- freesound_search_btn.set_label(_("Cancel"));
- pthread_t freesound_thr;
- pthread_create_and_store ("freesound_search", &freesound_thr, freesound_search_thread_entry, this);
- }
+ freesound_search_cancel = false;
+ freesound_search();
}
void
-SoundFileBrowser::freesound_search_thread()
+SoundFileBrowser::freesound_stop_clicked ()
{
-#if 0
+ freesound_download_cancel = true;
+ freesound_search_cancel = true;
+}
- THIS IS ALL TOTALLY THREAD-ILLEGAL ... YOU CANNOT DO GTK STUFF IN THIS THREAD
+void
+SoundFileBrowser::freesound_search()
+{
#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 ();
+ 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();
+ for (int page = 1; page <= 99; page++ ) {
+
+ std::string prog;
+ prog = string_compose (_("Page %1, [Stop]->"), page);
+ freesound_progress_bar.set_text(prog);
+ while (Glib::MainContext::get_default()->iteration (false)) {
+ /* do nothing */
+ }
- if ( theMootcher.doLogin( name_string, pass_string ) ) {
-
- string theString = theMootcher.searchText(search_string);
+ std::string theString = mootcher->searchText(
+ search_string,
+ page,
+ "", // filter, could do, e.g. "type:wav"
+ sort_method
+ );
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;
- }
+ if (!root) {
+ error << "no root XML node!" << endmsg;
+ break;
+ }
+
+ if ( strcmp(root->name().c_str(), "response") != 0) {
+ error << string_compose ("root node name == %1 != \"response\"", root->name()) << endmsg;
+ break;
+ }
+
+ XMLNode *sounds_root = root->child("sounds");
+
+ if (!sounds_root) {
+ error << "no child node \"sounds\" found!" << endmsg;
+ break;
+ }
+
+ XMLNodeList sounds = sounds_root->children();
+ XMLNodeConstIterator niter;
+ XMLNode *node;
+ for (niter = sounds.begin(); niter != sounds.end(); ++niter) {
+ node = *niter;
+ if( strcmp( node->name().c_str(), "resource") != 0 ){
+ error << string_compose ("node->name()=%1 != \"resource\"", node->name()) << endmsg;
+ freesound_search_cancel = true;
+ 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");
+
+ if (id_node && uri_node && ofn_node && dur_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 r;
+ // cerr << "id=" << id << ",uri=" << uri << ",ofn=" << ofn << ",dur=" << dur << endl;
+
+ double duration_seconds = atof(dur.c_str());
+ 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
+ );
}
+
+ 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;
+
}
}
- }
+
+ if (freesound_search_cancel)
+ break;
- searching = false;
- canceling = false;
- freesound_search_btn.set_label(_("Start Downloading"));
-#endif
-#endif
+ } //page "for" loop
+
+ gdk_window_set_cursor (get_window()->gobj(), prev_cursor);
+ freesound_progress_bar.set_text("");
+
+#endif
}
-vector<ustring>
+vector<string>
SoundFileBrowser::get_paths ()
{
- vector<ustring> results;
+ vector<string> results;
int n = notebook.get_current_page ();
if (n == 0) {
- vector<ustring> filenames = chooser.get_filenames();
- vector<ustring>::iterator i;
+ vector<string> filenames = chooser.get_filenames();
+ vector<string>::iterator i;
for (i = filenames.begin(); i != filenames.end(); ++i) {
struct stat buf;
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];
+ string str = (*iter)[found_list_columns.pathname];
results.push_back (str);
}
} else {
-
+#ifdef FREESOUND
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];
+ string id = (*iter)[freesound_list_columns.id];
+ string uri = (*iter)[freesound_list_columns.uri];
+ string ofn = (*iter)[freesound_list_columns.filename];
+
+ GdkCursor *prev_cursor;
+ prev_cursor = gdk_window_get_cursor (get_window()->gobj());
+ gdk_window_set_cursor (get_window()->gobj(), gdk_cursor_new(GDK_WATCH));
+ gdk_flush();
+
+ string str = mootcher->getAudioFile(ofn, id, uri, this);
+ if (str != "") {
+ results.push_back (str);
+ }
+
+ gdk_window_set_cursor (get_window()->gobj(), prev_cursor);
- results.push_back (str);
}
+#endif
}
return results;
bool
SoundFileOmega::reset_options ()
{
- vector<ustring> paths = get_paths ();
+ 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()) {
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::safe_midi_file_extension (*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;
}
- ustring existing_choice;
+ 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;
+ }
+ }
+
+ } else {
- 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;
+ /* MIDI ONLY */
- default:
- action_strings.push_back (importmode2string (ImportToTrack));
- break;
- }
+ if (selected_midi_track_cnt > 0) {
+ action_strings.push_back (importmode2string (ImportToTrack));
}
}
action_strings.push_back (importmode2string (ImportAsRegion));
action_strings.push_back (importmode2string (ImportAsTapeTrack));
- resetting_ourselves = true;
-
existing_choice = action_combo.get_active_text();
set_popdown_strings (action_combo, action_strings);
}
}
+ resetting_ourselves = true;
+
existing_choice = channel_combo.get_active_text();
set_popdown_strings (channel_combo, channel_strings);
channel_combo.set_active_text (channel_strings.front());
}
+ resetting_ourselves = false;
+
if (src_needed) {
src_combo.set_sensitive (true);
} else {
src_combo.set_sensitive (false);
}
+ /* We must copy MIDI files or those from Freesound */
+ bool const must_copy = have_a_midi_file || notebook.get_current_page() == 2;
+
if (Config->get_only_copy_imported_files()) {
- if (selection_can_be_embedded_with_links) {
+ 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;
}
bool
-SoundFileOmega::check_info (const vector<ustring>& paths, bool& same_size, bool& src_needed, bool& multichannel)
+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;
src_needed = false;
multichannel = false;
- for (vector<ustring>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
+ for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
if (AudioFileSource::get_soundfile_info (*i, info, errmsg)) {
if (info.channels > 1) {
}
}
- if ((nframes_t) info.samplerate != _session->frame_rate()) {
+ if (info.samplerate != _session->frame_rate()) {
src_needed = true;
}
bool
-SoundFileOmega::check_link_status (const Session* s, const vector<ustring>& paths)
+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();
+ std::string tmpdir(Glib::build_filename (s->session_directory().sound_path(), "linktest"));
bool ret = false;
if (mkdir (tmpdir.c_str(), 0744)) {
}
}
- for (vector<ustring>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
+ for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
char tmpc[MAXPATHLEN+1];
}
}
-ustring
+string
SoundFileChooser::get_filename ()
{
- vector<ustring> paths;
+ vector<string> paths;
paths = get_paths ();
if (paths.empty()) {
- return ustring ();
+ return string ();
}
if (!Glib::file_test (paths.front(), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
- return ustring();
+ return string();
}
return paths.front();
}
-SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Session* s, int selected_tracks, bool persistent,
+SoundFileOmega::SoundFileOmega (Gtk::Window& parent, string title, ARDOUR::Session* s,
+ uint32_t selected_audio_tracks,
+ uint32_t selected_midi_tracks,
+ bool persistent,
Editing::ImportMode mode_hint)
- : SoundFileBrowser (parent, title, s, persistent),
- copy_files_btn ( _("Copy files to session")),
- selected_track_cnt (selected_tracks)
+ : SoundFileBrowser (parent, title, s, persistent)
+ , copy_files_btn ( _("Copy files to session"))
+ , selected_audio_track_cnt (selected_audio_tracks)
+ , selected_midi_track_cnt (selected_midi_tracks)
{
VBox* vbox;
HBox* hbox;
where_combo.set_active_text (str.front());
Label* l = manage (new Label);
- l->set_text (_("Add files:"));
+ l->set_markup (_("<b>Add files as ...</b>"));
- 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);
+ vbox->set_border_width (12);
+ vbox->set_spacing (6);
+ vbox->pack_start (*l, false, false);
+ vbox->pack_start (action_combo, false, false);
+ hbox = manage (new HBox);
+ hbox->pack_start (*vbox, false, false);
+ options.pack_start (*hbox, false, false);
/* dummy entry for action combo so that it doesn't look odd if we
come up with no tracks selected.
action_combo.set_sensitive (false);
l = manage (new Label);
- l->set_text (_("Insert at:"));
+ l->set_markup (_("<b>Insert at</b>"));
- 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);
+ vbox->set_border_width (12);
+ vbox->set_spacing (6);
+ vbox->pack_start (*l, false, false);
+ vbox->pack_start (where_combo, false, false);
+ hbox = manage (new HBox);
+ hbox->pack_start (*vbox, false, false);
+ options.pack_start (*hbox, false, false);
l = manage (new Label);
- l->set_text (_("Mapping:"));
+ l->set_markup (_("<b>Mapping</b>"));
- 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);
+ vbox->set_border_width (12);
+ vbox->set_spacing (6);
+ vbox->pack_start (*l, false, false);
+ vbox->pack_start (channel_combo, false, false);
+ hbox = manage (new HBox);
+ hbox->pack_start (*vbox, false, false);
+ options.pack_start (*hbox, false, false);
str.clear ();
str.push_back (_("one track per file"));
channel_combo.set_sensitive (false);
l = manage (new Label);
- l->set_text (_("Conversion quality:"));
+ l->set_markup (_("<b>Conversion quality</b>"));
- 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);
+ vbox->set_border_width (12);
+ vbox->set_spacing (6);
+ vbox->pack_start (*l, false, false);
+ vbox->pack_start (src_combo, false, false);
+ hbox = manage (new HBox);
+ hbox->pack_start (*vbox, false, false);
+ options.pack_start (*hbox, false, false);
str.clear ();
str.push_back (_("Best"));
reset_options ();
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);
+ Gtk::Label* copy_label = dynamic_cast<Gtk::Label*>(copy_files_btn.get_child());
+
+ if (copy_label) {
+ copy_label->set_size_request (175, -1);
+ copy_label->set_line_wrap (true);
+ }
+
block_four.pack_start (copy_files_btn, false, false);
options.pack_start (block_four, false, false);
/* setup disposition map */
- disposition_map.insert (pair<ustring,ImportDisposition>(_("one track per file"), ImportDistinctFiles));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("one track per channel"), ImportDistinctChannels));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("merge files"), ImportMergeFiles));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("sequence files"), ImportSerializeFiles));
+ disposition_map.insert (pair<string,ImportDisposition>(_("one track per file"), ImportDistinctFiles));
+ disposition_map.insert (pair<string,ImportDisposition>(_("one track per channel"), ImportDistinctChannels));
+ disposition_map.insert (pair<string,ImportDisposition>(_("merge files"), ImportMergeFiles));
+ disposition_map.insert (pair<string,ImportDisposition>(_("sequence files"), ImportSerializeFiles));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("one region per file"), ImportDistinctFiles));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("one region per channel"), ImportDistinctChannels));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("all files in one region"), ImportMergeFiles));
- disposition_map.insert (pair<ustring,ImportDisposition>(_("all files in one track"), ImportMergeFiles));
+ disposition_map.insert (pair<string,ImportDisposition>(_("one region per file"), ImportDistinctFiles));
+ disposition_map.insert (pair<string,ImportDisposition>(_("one region per channel"), ImportDistinctChannels));
+ disposition_map.insert (pair<string,ImportDisposition>(_("all files in one region"), ImportMergeFiles));
+ disposition_map.insert (pair<string,ImportDisposition>(_("all files in one track"), ImportMergeFiles));
chooser.signal_selection_changed().connect (sigc::mem_fun (*this, &SoundFileOmega::file_selection_changed));
t.push_back (_("one track per channel"));
t.push_back (_("sequence files"));
t.push_back (_("all files in one region"));
- set_size_request_to_display_given_text (channel_combo, t, COMBO_FUDGE + 10, 15);
+ set_popdown_strings (channel_combo, t);
t.clear ();
t.push_back (importmode2string (ImportAsTrack));
t.push_back (importmode2string (ImportToTrack));
t.push_back (importmode2string (ImportAsRegion));
t.push_back (importmode2string (ImportAsTapeTrack));
- set_size_request_to_display_given_text (action_combo, t, COMBO_FUDGE + 10, 15);
+ set_popdown_strings (action_combo, t);
}
void
ImportPosition
SoundFileOmega::get_position() const
{
- ustring str = where_combo.get_active_text();
+ string str = where_combo.get_active_text();
if (str == _("file timestamp")) {
return ImportAtTimestamp;
SrcQuality
SoundFileOmega::get_src_quality() const
{
- ustring str = where_combo.get_active_text();
+ string str = where_combo.get_active_text();
if (str == _("Best")) {
return SrcBest;
and the ImportDisposition enum that corresponds to it.
*/
- ustring str = channel_combo.get_active_text();
+ string str = channel_combo.get_active_text();
DispositionMap::const_iterator x = disposition_map.find (str);
if (x == disposition_map.end()) {
}
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 ();
}
projects / ardour.git / blobdiff