- add without mp3

[packages/cdrdao.git] / cdrdao-gcc3.patch

--- cdrdao-1.1.5/trackdb/CdTextItem.cc.orig	Sun Apr 29 15:42:08 2001
+++ cdrdao-1.1.5/trackdb/CdTextItem.cc	Sat Oct 12 21:13:26 2002
@@ -18,6 +18,7 @@
  */
 
 #include <iostream.h>
+#include <iomanip.h>
 #include <assert.h>
 #include <string.h>
 #include <ctype.h>
@@ -129,7 +130,7 @@
       else if (isprint(data_[i]))
 	out << data_[i];
       else
-	out.form("\\%03o", (unsigned int)data_[i]);
+	out << '\\' << setw(3) << setfill('0') << oct << (unsigned int)data_[i] << setfill(' ') << dec;
     }
 
     out << "\"";
@@ -140,7 +141,7 @@
     out << " {";
     for (i = 0; i < dataLen_; i++) {
       if (i == 0) {
-	out.form("%2d", (unsigned int)data_[i]);
+	out << setw(2) << dec << (unsigned int)data_[i];
       }
       else {
 	if (i % 12 == 0) 
@@ -148,7 +149,7 @@
 	else
 	  out << ", ";
 
-	out.form("%2d", (unsigned int)data_[i]);
+	out << setw(2) << dec << (unsigned int)data_[i];
       }
     }
 
--- cdrdao-1.1.5/utils/toc2cue.cc.orig	Sun Apr 29 15:42:09 2001
+++ cdrdao-1.1.5/utils/toc2cue.cc	Sat Oct 12 21:21:18 2002
@@ -27,6 +27,7 @@
 #include <stdarg.h>
 #include <getopt.h>
 #include <fstream.h>
+#include <iomanip.h>
 
 #include "util.h"
 #include "Toc.h"
@@ -291,7 +292,7 @@
        trun != NULL;
        trun = titr.next(start, end), trackNr++) {
     out << "  TRACK ";
-    out.form("%02d ", trackNr);
+    out << setw(2) << setfill('0') << dec << trackNr << setfill(' ') << " ";
 
     switch (trun->type()) {
     case TrackData::AUDIO: