Index: /libmpc/branches/r2d/libmpc.kdevelop
===================================================================
--- /libmpc/branches/r2d/libmpc.kdevelop	(revision 232)
+++ /libmpc/branches/r2d/libmpc.kdevelop	(revision 233)
@@ -18,6 +18,6 @@
   <kdevautoproject>
     <general>
-      <activetarget>mpc2sv8/mpc2sv8</activetarget>
-      <useconfiguration>debug</useconfiguration>
+      <activetarget>mpcenc/mpcenc</activetarget>
+      <useconfiguration>optimized</useconfiguration>
     </general>
     <run>
@@ -42,15 +42,15 @@
         <cxxcompiler>kdevgppoptions</cxxcompiler>
         <f77compiler>kdevg77options</f77compiler>
-        <cflags>-O3 -fomit-frame-pointer -pipe -Wall</cflags>
+        <cflags>-O3 -fomit-frame-pointer -pipe -Wall -m3dnow -msse</cflags>
         <envvars/>
-        <configargs/>
-        <topsourcedir/>
-        <cppflags>-DMPP_ENCODER=1 -DTRUE=1 -DFALSE=0</cppflags>
-        <ldflags/>
-        <ccompilerbinary/>
-        <cxxcompilerbinary/>
-        <f77compilerbinary/>
-        <cxxflags/>
-        <f77flags/>
+        <configargs></configargs>
+        <topsourcedir></topsourcedir>
+        <cppflags>-I/home/nico/src/musepack/svn/libreplaygain/include</cppflags>
+        <ldflags>-L/home/nico/src/musepack/svn/libreplaygain/src</ldflags>
+        <ccompilerbinary></ccompilerbinary>
+        <cxxcompilerbinary></cxxcompilerbinary>
+        <f77compilerbinary></f77compilerbinary>
+        <cxxflags></cxxflags>
+        <f77flags></f77flags>
       </optimized>
       <debug>
@@ -62,12 +62,12 @@
         <cflags>-O0 -Wall -g3</cflags>
         <envvars/>
-        <topsourcedir/>
-        <cppflags/>
-        <ldflags/>
-        <ccompilerbinary/>
-        <cxxcompilerbinary/>
-        <f77compilerbinary/>
-        <cxxflags/>
-        <f77flags/>
+        <topsourcedir></topsourcedir>
+        <cppflags>-I/home/nico/src/musepack/svn/libreplaygain/include</cppflags>
+        <ldflags>-L/home/nico/src/musepack/svn/libreplaygain/src</ldflags>
+        <ccompilerbinary></ccompilerbinary>
+        <cxxcompilerbinary></cxxcompilerbinary>
+        <f77compilerbinary></f77compilerbinary>
+        <cxxflags></cxxflags>
+        <f77flags></f77flags>
       </debug>
     </configurations>
@@ -204,5 +204,5 @@
   <kdevdebugger>
     <general>
-      <programargs>~/test1.mpc ~/test1-conv.mpc</programargs>
+      <programargs>--artist &quot;madonna&quot; &quot;/home/nico/08 - Jimmy Jimmy.wav&quot;</programargs>
       <gdbpath></gdbpath>
       <dbgshell>libtool</dbgshell>
Index: /libmpc/branches/r2d/mpc2sv8/mpc2sv8.c
===================================================================
--- /libmpc/branches/r2d/mpc2sv8/mpc2sv8.c	(revision 232)
+++ /libmpc/branches/r2d/mpc2sv8/mpc2sv8.c	(revision 233)
@@ -102,4 +102,11 @@
     mpc_demux_get_info(demux,  &si);
 
+	if (si.stream_version >= 8) {
+		fprintf(stderr, "Error : this file is already a sv8 file\n");
+		mpc_demux_exit(demux);
+		mpc_reader_exit_stdio(&reader);
+		return MPC_STATUS_INVALIDSV;
+	}
+
 	mpc_encoder_init(&e, si.samples, 6, 1);
 	e.outputFile = fopen( argv[2], "w+b" );
@@ -113,5 +120,5 @@
 		size_t tmp_size = fread(buf, 1, mini(TMP_BUF_SIZE, r_size), in_file);
 		if (fwrite(buf, 1, tmp_size, e.outputFile) != tmp_size) {
-			fprintf(stderr, "Error writing to target file");
+			fprintf(stderr, "Error writing to target file\n");
 			exit(!MPC_STATUS_OK);
 		}
Index: /libmpc/branches/r2d/mpcenc/mpcenc.c
===================================================================
--- /libmpc/branches/r2d/mpcenc/mpcenc.c	(revision 232)
+++ /libmpc/branches/r2d/mpcenc/mpcenc.c	(revision 233)
@@ -71,5 +71,5 @@
 #define MPCENC_VERSION cat(MPCENC_MAJOR,MPCENC_MINOR,MPCENC_BUILD)
 
-const char    About []        = "MPC Encoder " MPCENC_VERSION " (C) 1999-2007 Buschmann/Klemm/Piecha/MDT";
+const char    About []        = "MPC Encoder " MPCENC_VERSION " (C) 1999-2007 Buschmann/Klemm/Piecha/MDT\nBuilt " __DATE__ " " __TIME__;