summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
Diffstat (limited to 'muse2')
-rw-r--r--muse2/ChangeLog3
-rw-r--r--muse2/muse/arranger/pcanvas.cpp4
-rw-r--r--muse2/muse/globals.cpp4
-rw-r--r--muse2/muse/widgets/unusedwavefiles.cpp3
4 files changed, 9 insertions, 5 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index f36841d7..d0c014fd 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,6 +1,7 @@
06.09.2012:
- Bug 3555581: No synths listed in Edit menu: main.cpp: Move initMidiSynth() ahead of MusE. (Tim)
- - Simple change: Privatize Arranger::parentWin. (Tim)
+ - Unrelated simple change: Privatize Arranger::parentWin. (Tim)
+ - Feature request 3565102: FLAC audio file import. (Tim)
04.09.2012:
- Fix for forum topic "Ordering of simultaneous events". (Tim)
Methods EventList::add() and ::move() now sort all same-time notes AFTER controllers.
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 20c06660..1afea012 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -3208,6 +3208,7 @@ void PartCanvas::viewDropEvent(QDropEvent* event)
if (text.endsWith(".wav",Qt::CaseInsensitive) ||
text.endsWith(".ogg",Qt::CaseInsensitive) ||
+ text.endsWith(".flac",Qt::CaseInsensitive) ||
text.endsWith(".mpt", Qt::CaseInsensitive) )
{
@@ -3224,7 +3225,8 @@ void PartCanvas::viewDropEvent(QDropEvent* event)
}
if (track->type() == MusECore::Track::WAVE &&
(text.endsWith(".wav", Qt::CaseInsensitive) ||
- (text.endsWith(".ogg", Qt::CaseInsensitive))))
+ text.endsWith(".ogg", Qt::CaseInsensitive) ||
+ (text.endsWith(".flac", Qt::CaseInsensitive)) ))
{
unsigned tick = x;
MusEGlobal::muse->importWaveToTrack(text, tick, track);
diff --git a/muse2/muse/globals.cpp b/muse2/muse/globals.cpp
index 967f0870..ec9de587 100644
--- a/muse2/muse/globals.cpp
+++ b/muse2/muse/globals.cpp
@@ -212,8 +212,8 @@ const char* drum_map_file_save_pattern[] = {
};
const char* audio_file_pattern[] = {
- QT_TRANSLATE_NOOP("file_patterns", "Wave/Binary (*.wav *.ogg *.bin)"),
- QT_TRANSLATE_NOOP("file_patterns", "Wave (*.wav *.ogg)"),
+ QT_TRANSLATE_NOOP("file_patterns", "Wave/Binary (*.wav *.ogg *.flac *.bin)"),
+ QT_TRANSLATE_NOOP("file_patterns", "Wave (*.wav *.ogg *.flac)"),
QT_TRANSLATE_NOOP("file_patterns", "Binary (*.bin)"),
QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
0
diff --git a/muse2/muse/widgets/unusedwavefiles.cpp b/muse2/muse/widgets/unusedwavefiles.cpp
index a7f2c776..729559fe 100644
--- a/muse2/muse/widgets/unusedwavefiles.cpp
+++ b/muse2/muse/widgets/unusedwavefiles.cpp
@@ -56,6 +56,7 @@ void UnusedWaveFiles::findWaveFiles()
QStringList filter;
filter.append("*.wav");
filter.append("*.ogg");
+ filter.append("*.flac");
allWaveFiles= dir.entryList(filter);
if (!allWaveFiles.count())
return;
@@ -75,7 +76,7 @@ void UnusedWaveFiles::findWaveFiles()
QTextStream fileContent(fp);
while (!fileContent.atEnd()) {
QString line = fileContent.readLine();
- if (line.contains(".wav") || line.contains(".ogg")) { // optimization
+ if (line.contains(".wav") || line.contains(".ogg") || line.contains(".flac")) { // optimization
foreach (QString wav, allWaveFiles) {
//printf("checking wav [%s]\n", wav.toLatin1().data() );
if (line.contains(wav)) {