Common subdirectories: text2skin_org/CVS and text2skin/CVS
Common subdirectories: text2skin_org/Docs and text2skin/Docs
diff --to-file=text2skin -Nu text2skin_org/Makefile text2skin/Makefile
--- text2skin_org/Makefile	2005-01-27 19:32:08.000000000 +0100
+++ text2skin/Makefile	2005-06-06 20:07:41.801875448 +0200
@@ -89,7 +89,7 @@
 	CXXFLAGS += -g -fno-inline
 	DEFINES += -DDEBUG
 else
-	CXXFLAGS += -O2 -g
+	CXXFLAGS += -O3
 ifdef BENCH
 	DEFINES += -DBENCH
 endif
Common subdirectories: text2skin_org/contrib and text2skin/contrib
diff --to-file=text2skin -Nu text2skin_org/display.c text2skin/display.c
--- text2skin_org/display.c	2005-05-30 15:03:14.000000000 +0200
+++ text2skin/display.c	2005-06-06 20:07:41.778878944 +0200
@@ -185,8 +185,10 @@
 
 	case tPresentRemaining:
 		return mPresent != NULL
-		       ? (cxType)DurationType((mPresent->Duration() - (time(NULL) - mPresent->StartTime()))
-		                              * FRAMESPERSEC, Token.Attrib.Text)
+		       ? ((time(NULL) - mPresent->StartTime()) <= mPresent->Duration()
+		            ? (cxType)DurationType((mPresent->Duration() - (time(NULL) - mPresent->StartTime()))
+		                                   * FRAMESPERSEC, Token.Attrib.Text)
+		            : (cxType)false)
 		       : (cxType)false;
 
 	case tPresentTitle:
Common subdirectories: text2skin_org/graphtft and text2skin/graphtft
Common subdirectories: text2skin_org/patches and text2skin/patches
diff --to-file=text2skin -Nu text2skin_org/render.c text2skin/render.c
--- text2skin_org/render.c	2005-01-27 19:31:12.000000000 +0100
+++ text2skin/render.c	2005-06-06 20:07:41.805874840 +0200
@@ -605,8 +605,10 @@
 			}
 			else if (Token.Type == tReplayTitle) {
 				if (Text2SkinStatus.ReplayMode() == cText2SkinStatus::replayMP3) {
-					str.erase(0, 4);
-					res = str;
+				        if ((pos = str.find("[")) == 0) {
+					        str.erase(0, 4);
+					        res = str;
+				        }
 				}
 				Dprintf("ReplayTitle result: |%s|\n", res.String().c_str());
 			}
@@ -622,6 +624,9 @@
 						str.erase(0, 1);
 					res = str;
 				}
+				if ((pos = str.find("'")) != -1) {
+				        res = str.erase(pos - 1);
+				}
 				Dprintf("MenuTitle 'rest' result: |%s|\n", res.String().c_str());
 			}
 		}
diff --to-file=text2skin -Nu text2skin_org/status.c text2skin/status.c
--- text2skin_org/status.c	2005-06-03 10:53:14.000000000 +0200
+++ text2skin/status.c	2005-06-06 20:07:41.808874384 +0200
@@ -6,7 +6,7 @@
 #include "render.h"
 
 const std::string ReplayNames[__REPLAY_COUNT__] =
-	{ "", "normal", "mp3", "mplayer", "dvd", "vcd", "image" };
+	{ "", "normal", "mp3", "mplayer", "dvd", "vcd", "image", "audiocd" };
 
 cText2SkinStatus Text2SkinStatus;
 
@@ -69,6 +69,9 @@
 			if (Name[i]) { // replaying DVD
 				mReplayMode = replayDVD;
 			}
+			if (Name[0] == '[' && Name[8] == ']' && Name[10] == '(') {
+			        mReplayMode = replayAudioCd;
+			}
 		}
 	} else {
 	  mReplayMode = replayNone;
diff --to-file=text2skin -Nu text2skin_org/status.h text2skin/status.h
--- text2skin_org/status.h	2005-06-03 10:53:14.000000000 +0200
+++ text2skin/status.h	2005-06-06 20:07:41.808874384 +0200
@@ -20,8 +20,9 @@
 		replayDVD,
 		replayVCD,
 		replayImage,
+		replayAudioCd,
 
-#define __REPLAY_COUNT__ (cText2SkinStatus::replayImage+1)
+#define __REPLAY_COUNT__ (cText2SkinStatus::replayAudioCd+1)
 	};
 
 	typedef std::string tRecordingInfo;
Common subdirectories: text2skin_org/xml and text2skin/xml