projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add icons for cut mouse mode button and cut cursor (both need improving)
[ardour.git]
/
gtk2_ardour
/
sfdb_ui.cc
diff --git
a/gtk2_ardour/sfdb_ui.cc
b/gtk2_ardour/sfdb_ui.cc
index 8011268335938569bfe7c31583df7221556f687f..da29eb75a84a17cca6bb1f193d678a8f4c98a483 100644
(file)
--- a/
gtk2_ardour/sfdb_ui.cc
+++ b/
gtk2_ardour/sfdb_ui.cc
@@
-64,7
+64,6
@@
#include "prompter.h"
#include "sfdb_ui.h"
#include "editing.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 "gain_meter.h"
#include "main_clock.h"
#include "public_editor.h"
@@
-281,7
+280,7
@@
SoundFileBox::setup_labels (const string& filename)
string error_msg;
string error_msg;
- if (SMFSource::
safe_midi_file_extension
(path)) {
+ if (SMFSource::
valid_midi_file
(path)) {
boost::shared_ptr<SMFSource> ms =
boost::dynamic_pointer_cast<SMFSource> (
boost::shared_ptr<SMFSource> ms =
boost::dynamic_pointer_cast<SMFSource> (
@@
-406,7
+405,7
@@
SoundFileBox::audition ()
boost::shared_ptr<Region> r;
boost::shared_ptr<Region> r;
- if (SMFSource::
safe_midi_file_extension
(path)) {
+ if (SMFSource::
valid_midi_file
(path)) {
boost::shared_ptr<SMFSource> ms =
boost::dynamic_pointer_cast<SMFSource> (
boost::shared_ptr<SMFSource> ms =
boost::dynamic_pointer_cast<SMFSource> (
@@
-1326,7
+1325,7
@@
SoundFileOmega::reset_options ()
/* See if we are thinking about importing any MIDI files */
vector<string>::iterator i = paths.begin ();
/* 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) {
+ while (i != paths.end() && SMFSource::
valid_midi_file
(*i) == false) {
++i;
}
bool const have_a_midi_file = (i != paths.end ());
++i;
}
bool const have_a_midi_file = (i != paths.end ());
@@
-1554,7
+1553,7
@@
SoundFileOmega::check_info (const vector<string>& paths, bool& same_size, bool&
src_needed = true;
}
src_needed = true;
}
- } else if (SMFSource::
safe_midi_file_extension
(*i)) {
+ } else if (SMFSource::
valid_midi_file
(*i)) {
Evoral::SMF reader;
reader.open(*i);
Evoral::SMF reader;
reader.open(*i);