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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/30 18:15:39

Modified files:
        src/core       : MonoReader.cpp Peak.cpp Project.cpp 

Log message:
        * use QString::toUtf8 () to convert to a char array. 
        Fixes problems with non ascii project names.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/MonoReader.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.32&r2=1.33

Patches:
Index: MonoReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/MonoReader.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MonoReader.cpp      30 Apr 2007 13:49:59 -0000      1.3
+++ MonoReader.cpp      30 Apr 2007 18:15:39 -0000      1.4
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: MonoReader.cpp,v 1.3 2007/04/30 13:49:59 r_sijrier Exp $
+$Id: MonoReader.cpp,v 1.4 2007/04/30 18:15:39 r_sijrier Exp $
 */
 
 
@@ -95,7 +95,7 @@
        memset (&m_sfinfo, 0, sizeof(m_sfinfo));
 
 
-       if ((m_sf = sf_open (QS_C(m_fileName), SFM_READ, &m_sfinfo)) == 0) {
+       if ((m_sf = sf_open ((m_fileName.toUtf8().data()), SFM_READ, 
&m_sfinfo)) == 0) {
                PERROR("Couldn't open soundfile (%s)", QS_C(m_fileName));
                return ReadSource::COULD_NOT_OPEN_FILE;
        }

Index: Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- Peak.cpp    23 Apr 2007 15:02:36 -0000      1.19
+++ Peak.cpp    30 Apr 2007 18:15:39 -0000      1.20
@@ -99,7 +99,7 @@
        
        Q_ASSERT(m_source);
        
-       m_file = fopen(m_fileName.toAscii().data(),"rb");
+       m_file = fopen(m_fileName.toUtf8().data(),"rb");
        
        if (! m_file) {
                PERROR("Couldn't open peak file for reading! (%s)", 
m_fileName.toAscii().data());
@@ -364,7 +364,7 @@
        m_normFileName.append(".norm");
        
        // Create read/write enabled file
-       m_file = fopen(m_fileName.toAscii().data(),"wb+");
+       m_file = fopen(m_fileName.toUtf8().data(),"wb+");
        
        if (! m_file) {
                PWARN("Couldn't open peak file for writing! (%s)", 
m_fileName.toAscii().data());
@@ -373,7 +373,7 @@
        }
        
        // Create the temporary normalization data file
-       m_normFile = fopen(m_normFileName.toAscii().data(), "wb+");
+       m_normFile = fopen(m_normFileName.toUtf8().data(), "wb+");
        
        if (! m_normFile) {
                PWARN("Couldn't open normalization data file for writing! 
(%s)", m_normFileName.toAscii().data());

Index: Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- Project.cpp 30 Apr 2007 17:50:17 -0000      1.32
+++ Project.cpp 30 Apr 2007 18:15:39 -0000      1.33
@@ -594,7 +594,6 @@
 
 QString Project::get_import_dir() const
 {
-       printf("import dir %s\n", QS_C(m_importDir));
        return m_importDir;
 }