[Traverso-commit] traverso/src/core Marker.cpp Marker.h Song.cpp

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/05/09 20:36:37

Modified files:
        src/core       : Marker.cpp Marker.h Song.cpp 

Log message:
        Bugfix in the new cdrdao export function

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Marker.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Marker.h?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.90&r2=1.91

Patches:
Index: Marker.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Marker.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Marker.cpp  9 May 2007 20:11:47 -0000       1.10
+++ Marker.cpp  9 May 2007 20:36:37 -0000       1.11
@@ -77,12 +77,15 @@
                case CDTRACK:
                        domNode.setAttribute("type",  "CDTRACK");
                        break;
-               case TEMPORARY:
-                       domNode.setAttribute("type",  "TEMPORARY");
-                       break;
                case ENDMARKER:
                        domNode.setAttribute("type",  "ENDMARKER");
                        break;
+               case TEMP_CDTRACK:
+                       domNode.setAttribute("type",  "TEMP_CDTRACK");
+                       break;
+               case TEMP_ENDMARKER:
+                       domNode.setAttribute("type",  "TEMP_ENDMARKER");
+                       break;
        }
 
        return domNode;
@@ -106,8 +109,9 @@
        m_copyprotect = e.attribute("copyprotection", "0").toInt();
 
        if (tp == "CDTRACK") m_type = CDTRACK;
-       if (tp == "TEMPORARY") m_type = TEMPORARY;
        if (tp == "ENDMARKER") m_type = ENDMARKER;
+       if (tp == "TEMP_CDTRACK") m_type = TEMP_CDTRACK;
+       if (tp == "TEMP_ENDMARKER") m_type = TEMP_ENDMARKER;
 
        return 1;
 }

Index: Marker.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Marker.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Marker.h    9 May 2007 20:11:47 -0000       1.10
+++ Marker.h    9 May 2007 20:36:37 -0000       1.11
@@ -37,8 +37,9 @@
 public:
        enum Type {
                CDTRACK,
-               TEMPORARY,
-               ENDMARKER
+               ENDMARKER,
+               TEMP_CDTRACK,
+               TEMP_ENDMARKER
        };
 
        Marker(TimeLine* tl, nframes_t when, Type type = CDTRACK);

Index: Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- Song.cpp    9 May 2007 20:11:47 -0000       1.90
+++ Song.cpp    9 May 2007 20:36:37 -0000       1.91
@@ -879,18 +879,18 @@
                        case 0:
                                // no markers present. We add one at the 
beginning and one at the
                                // end of the render area.
-                               mlist.append(new Marker(m_timeline, 
spec->start_frame, Marker::TEMPORARY));
-                               mlist.append(new Marker(m_timeline, 
spec->end_frame, Marker::TEMPORARY));
+                               mlist.append(new Marker(m_timeline, 
spec->start_frame, Marker::TEMP_CDTRACK));
+                               mlist.append(new Marker(m_timeline, 
spec->end_frame, Marker::TEMP_ENDMARKER));
                                break;
                        case 1:
                                // one marker is present. We add two more at 
the beginning
                                // and at the end of the render area. But we 
must check if 
                                // the present marker happens to be at one of 
these positions.
                                if (mlist.at(0)->get_when() != 
spec->start_frame) {
-                                       mlist.append(new Marker(m_timeline, 
spec->start_frame, Marker::TEMPORARY));
+                                       mlist.append(new Marker(m_timeline, 
spec->start_frame, Marker::TEMP_CDTRACK));
                                }
                                if (mlist.at(0)->get_when() != spec->end_frame) 
{
-                                       mlist.append(new Marker(m_timeline, 
spec->end_frame, Marker::TEMPORARY));
+                                       mlist.append(new Marker(m_timeline, 
spec->end_frame, Marker::TEMP_ENDMARKER));
                                }
                                break;
                }
@@ -898,7 +898,7 @@
                //Â would be ok, but let's check if there is an end marker 
present. If not,
                //Â add one to spec->end_frame
                if (!m_timeline->has_end_marker()) {
-                       mlist.append(new Marker(m_timeline, spec->end_frame, 
Marker::TEMPORARY));
+                       mlist.append(new Marker(m_timeline, spec->end_frame, 
Marker::TEMP_ENDMARKER));
                }
        }
 
@@ -952,7 +952,7 @@
                start += length;
 
                // check if the second marker is of type "Endmarker"
-               if (m_end->get_type() == 10) {
+               if ((m_end->get_type() == Marker::ENDMARKER) || 
(m_end->get_type() == Marker::TEMP_ENDMARKER)) {
                        break;
                }
        }
@@ -960,7 +960,7 @@
        //Â delete all temporary markers
        for(int i = mlist.size() - 1; i >= 0; --i) {
                Marker *marker = mlist.at(i);
-               if (marker->get_type() == Marker::TEMPORARY) {
+               if ((marker->get_type() == Marker::TEMP_CDTRACK) || 
(marker->get_type() == Marker::TEMP_ENDMARKER)) {
                        mlist.removeAt(i);
                        delete marker;
                }