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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/10/10 19:45:00

Modified files:
        src/core       : AudioFileMerger.cpp Peak.cpp 
                         ProjectConverter.cpp 

Log message:
        * set FileMerger bitdept to float (32 bit), and create peaks on the fly

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioFileMerger.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectConverter.cpp?cvsroot=traverso&r1=1.1&r2=1.2

Patches:
Index: AudioFileMerger.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioFileMerger.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AudioFileMerger.cpp 10 Oct 2007 16:49:45 -0000      1.1
+++ AudioFileMerger.cpp 10 Oct 2007 19:44:59 -0000      1.2
@@ -84,7 +84,7 @@
        spec->exportdir = task.dir;
        spec->writerType = "sndfile";
        spec->extraFormat["filetype"] = "wav";
-       spec->data_width = 16;
+       spec->data_width = 1;   // 1 means float
        spec->channels = 2;
        spec->sample_rate = task.readsource0->get_rate();
        spec->blocksize = buffersize;
@@ -98,6 +98,7 @@
                delete spec;
                return;
        }
+       writesource->set_process_peaks(true);
        
        int oldprogress = 0;
        do {

Index: Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- Peak.cpp    28 Sep 2007 19:12:05 -0000      1.60
+++ Peak.cpp    10 Oct 2007 19:45:00 -0000      1.61
@@ -58,7 +58,14 @@
        m_peaksAvailable = m_permanentFailure = m_interuptPeakBuild = false;
        
        QString sourcename = source->get_name();
-       QString path = pm().get_project()->get_root_dir() + "/peakfiles/";
+       QString path;
+       Project* project = pm().get_project();
+       if (project) {
+               path = project->get_root_dir() + "/peakfiles/";
+       } else {
+               path = source->get_dir();
+               path = path.replace("audiosources", "peakfiles");
+       }
        
        for (uint chan = 0; chan < source->get_channel_count(); ++ chan) {
                ChannelData* data = new Peak::ChannelData;

Index: ProjectConverter.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectConverter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ProjectConverter.cpp        10 Oct 2007 16:49:45 -0000      1.1
+++ ProjectConverter.cpp        10 Oct 2007 19:45:00 -0000      1.2
@@ -100,7 +100,6 @@
        
        QString version = projectelement.attribute("projectfileversion", "-1");
        int projectrate = projectelement.attribute("rate", "44100").toInt();
-       printf("version is %s\n", QS_C(version));
        version = QString::number(3);
        projectelement.setAttribute("projectfileversion", version);