[Traverso-commit] traverso/src/core Peak.cpp

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/01/07 19:20:48

Modified files:
        src/core       : Peak.cpp 

Log message:
        * QFile can't open a file with a German umlaut when the name was set 
with Utf8 but it works when using toLatin1()
        Isn't Utf8 supposed to support German umlauts as well? Maybe a bug in 
QFile ?

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.78&r2=1.79

Patches:
Index: Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- Peak.cpp    19 Nov 2007 11:19:49 -0000      1.78
+++ Peak.cpp    7 Jan 2008 19:20:48 -0000       1.79
@@ -28,6 +28,7 @@
 #include "ResourcesManager.h"
 #include "defines.h"
 #include "Mixer.h"
+#include "FileHelpers.h"
 #include <QFileInfo>
 #include <QDateTime>
 #include <QMutexLocker>
@@ -130,10 +131,15 @@
        
        foreach(ChannelData* data, m_channelData) {
                
-               data->file.setFileName(data->fileName.toUtf8().data());
+               data->file.setFileName(data->fileName.toLatin1().data());
                
                if (! data->file.open(QIODevice::ReadOnly)) {
-                       PERROR("Couldn't open peak file for reading! (%s)", 
data->fileName.toAscii().data());
+                       if (QFile::exists(data->fileName)) {
+                               m_permanentFailure = true;
+                       }
+                               
+                       QString errorstring = 
FileHelper::fileerror_to_string(data->file.error());
+                       PERROR("Couldn't open peak file for reading! (%s, 
Error: %s)", data->fileName.toUtf8().data(), QS_C(errorstring));
                        return -1;
                }
 
@@ -656,7 +662,6 @@
                        emit progress(progression);
                        data->pd->progress = progression;
                }
-               
        } while (totalReadFrames < m_source->get_nframes());