diff src/sid/xs_title.c @ 735:6c3c7b841382 trunk

[svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).

--- a/src/sid/xs_title.c	Tue Feb 27 01:27:06 2007 -0800
+++ b/src/sid/xs_title.c	Tue Feb 27 01:40:23 2007 -0800
@@ -4,7 +4,7 @@
    Titlestring handling
    
    Programmed and designed by Matti 'ccr' Hamalainen <[e-mail]>
-   (C) Copyright 1999-2005 Tecnic Software productions (TNSP)
+   (C) Copyright 1999-2007 Tecnic Software productions (TNSP)
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,99 +16,142 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include "xs_title.h"
 #include "xs_support.h"
 #include "xs_config.h"
-#include "audacious/titlestring.h"
+#ifdef AUDACIOUS_PLUGIN
+#include <audacious/titlestring.h>
+#else
+#include <xmms/titlestring.h>
+#endif
+
+
+static void xs_path_split(gchar *path, gchar **tmpFilename, gchar **tmpFilePath, gchar **tmpFileExt)
+{
+	gchar *tmpStr;
+	
+	/* Split the filename into path */
+	*tmpFilePath = g_strdup(path);
+	tmpStr = xs_strrchr(*tmpFilePath, '/');
+	if (tmpStr) tmpStr[1] = 0;
+
+	/* Filename */
+	*tmpFilename = xs_strrchr(path, '/');
+	if (*tmpFilename)
+		*tmpFilename = g_strdup(*tmpFilename + 1);
+	else
+		*tmpFilename = g_strdup(path);
+
+	tmpStr = xs_strrchr(*tmpFilename, '.');
+	tmpStr[0] = 0;
+
+	/* Extension */
+	*tmpFileExt = xs_strrchr(path, '.');
+}
+
+
+#if defined(HAVE_XMMSEXTRA) || defined(AUDACIOUS_PLUGIN)
+/* Tuple support
+ */
+static TitleInput * xs_get_titletuple(gchar *tmpFilename, gchar *tmpFilePath,
+	gchar *tmpFileExt, t_xs_tuneinfo *p, gint subTune)
+{
+	TitleInput *pResult;
+	
+#ifdef AUDACIOUS_PLUGIN
+	pResult = bmp_title_input_new();
+#else
+	pResult = (TitleInput *) g_malloc0(sizeof(TitleInput));
+	pResult->__size = XMMS_TITLEINPUT_SIZE;
+	pResult->__version = XMMS_TITLEINPUT_VERSION;
+#endif
+
+	/* Create the input fields */
+	pResult->file_name = tmpFilename;
+	pResult->file_ext = tmpFileExt;
+	pResult->file_path = tmpFilePath;
+
+	pResult->track_name = g_strdup(p->sidName);
+	pResult->track_number = subTune;
+	pResult->album_name = NULL;
+	pResult->performer = g_strdup(p->sidComposer);
+	pResult->date = g_strdup((p->sidModel == XS_SIDMODEL_6581) ? "SID6581" : "SID8580");
+
+	pResult->year = 0;
+	pResult->genre = g_strdup("SID-tune");
+	pResult->comment = g_strdup(p->sidCopyright);
+	
+	return pResult;
+}
+
+#ifdef AUDACIOUS_PLUGIN
+TitleInput * xs_make_titletuple(t_xs_tuneinfo *p, gint subTune)
+{
+	gchar *tmpFilename, *tmpFilePath, *tmpFileExt;
+
+	xs_path_split(p->sidFilename, &tmpFilename, &tmpFilePath, &tmpFileExt);
+	
+	return xs_get_titletuple(tmpFilename, tmpFilePath, tmpFileExt, p, subTune);
+}
+#endif
+#endif
 
 
 /*
  * Create a title string based on given information and settings.
  */
 #define VPUTCH(MCH)	\
-if (iIndex < XS_BUF_SIZE) tmpBuf[iIndex++] = MCH;
+	if (iIndex < XS_BUF_SIZE) tmpBuf[iIndex++] = MCH;
+
 #define VPUTSTR(MSTR) {						\
 	if (MSTR) {						\
 		if ((iIndex + strlen(MSTR) + 1) < XS_BUF_SIZE) {	\
 			strcpy(&tmpBuf[iIndex], MSTR);		\
 			iIndex += strlen(MSTR); 		\
-			} else					\
+		} else						\
 			iIndex = XS_BUF_SIZE;			\
-		}						\
-	}
-
-
-gchar *xs_make_titlestring(gchar * pcFilename, gint iSubTune, gint nSubTunes, gint iSidModel,
-			   const gchar * formatString, const gchar * infoString0,
-			   const gchar * infoString1, const gchar * infoString2)
-{
-	gchar *tmpFilename, *tmpFilePath, *tmpFileExt, *pcStr, *pcResult, tmpStr[XS_BUF_SIZE], tmpBuf[XS_BUF_SIZE];
-	gint iIndex;
-#ifdef HAVE_XMMSEXTRA
-	TitleInput *ptInput;
-#endif
-
-	/* Split the filename into path */
-	tmpFilePath = g_strdup(pcFilename);
-	tmpFilename = xs_strrchr(tmpFilePath, '/');
-	if (tmpFilename)
-		tmpFilename[1] = 0;
-
-	/* Filename */
-	tmpFilename = xs_strrchr(pcFilename, '/');
-	if (tmpFilename)
-		tmpFilename = g_strdup(tmpFilename + 1);
-	else
-		tmpFilename = g_strdup(pcFilename);
-
-	tmpFileExt = xs_strrchr(tmpFilename, '.');
-	tmpFileExt[0] = 0;
-
-	/* Extension */
-	tmpFileExt = xs_strrchr(pcFilename, '.');
+	}							\
+}
 
 
-#ifdef HAVE_XMMSEXTRA
-	/* Check if the titles are overridden or not */
-	if (!xs_cfg.titleOverride) {
-		/* Use generic XMMS titles */
-		/* XMMS_NEW_TITLEINPUT(ptInput);
-		 * We duplicate and add typecast to the code here due to XMMS's braindead headers
-		 */
-		ptInput = (TitleInput *) g_malloc0(sizeof(TitleInput));
-		ptInput->__size = XMMS_TITLEINPUT_SIZE;
-		ptInput->__version = XMMS_TITLEINPUT_VERSION;
+gchar *xs_make_titlestring(t_xs_tuneinfo *p, gint subTune)
+{
+	gchar *tmpFilename, *tmpFilePath, *tmpFileExt,
+		*pcStr, *pcResult, tmpStr[XS_BUF_SIZE], tmpBuf[XS_BUF_SIZE];
+	t_xs_subtuneinfo *subInfo;
+	gint iIndex;
 
-		/* Create the input fields */
-		ptInput->file_name = tmpFilename;
-		ptInput->file_ext = tmpFileExt;
-		ptInput->file_path = tmpFilePath;
+	/* Get filename parts */
+	xs_path_split(p->sidFilename, &tmpFilename,
+		&tmpFilePath, &tmpFileExt);
+	
+	/* Get sub-tune information */
+	if ((subTune > 0) && (subTune <= p->nsubTunes)) {
+		subInfo = &(p->subTunes[subTune - 1]);
+	} else
+		subInfo = NULL;
 
-		ptInput->track_name = g_strdup(infoString0);
-		ptInput->track_number = iSubTune;
-		ptInput->album_name = NULL;
-		ptInput->performer = g_strdup(infoString1);
-		ptInput->date = g_strdup((iSidModel == XS_SIDMODEL_6581) ? "SID6581" : "SID8580");
 
-		ptInput->year = 0;
-		ptInput->genre = g_strdup("SID-tune");
-		ptInput->comment = g_strdup(infoString2);
+	/* Check if the titles are overridden or not */
+#if defined(HAVE_XMMSEXTRA) || defined(AUDACIOUS_PLUGIN)
+	if (!xs_cfg.titleOverride) {
+		TitleInput *pTuple = xs_get_titletuple(
+			tmpFilename, tmpFilePath, tmpFileExt, p, subTune);
+		
+		pcResult = xmms_get_titlestring(xmms_get_gentitle_format(), pTuple);
 
-		/* Create the string */
-		pcResult = xmms_get_titlestring(xmms_get_gentitle_format(), ptInput);
-
-		/* Dispose all allocated memory */
-		g_free(ptInput->track_name);
-		g_free(ptInput->performer);
-		g_free(ptInput->comment);
-		g_free(ptInput->date);
-		g_free(ptInput->genre);
-		g_free(ptInput);
-	} else
+		g_free(pTuple->track_name);
+		g_free(pTuple->album_name);
+		g_free(pTuple->performer);
+		g_free(pTuple->date);
+		g_free(pTuple->genre);
+		g_free(pTuple->comment);
+		g_free(pTuple);
+	} else 
 #endif
 	{
 		/* Create the string */
@@ -131,42 +174,71 @@
 					VPUTSTR(tmpFileExt);
 					break;
 				case 'p':
-					VPUTSTR(infoString1);
+					VPUTSTR(p->sidComposer);
 					break;
 				case 't':
-					VPUTSTR(infoString0);
+					VPUTSTR(p->sidName);
 					break;
 				case 'c':
-					VPUTSTR(infoString2);
+					VPUTSTR(p->sidCopyright);
 					break;
 				case 's':
-					VPUTSTR(formatString);
+					VPUTSTR(p->sidFormat);
 					break;
 				case 'm':
-					switch (iSidModel) {
+					switch (p->sidModel) {
 					case XS_SIDMODEL_6581:
 						VPUTSTR("6581");
 						break;
 					case XS_SIDMODEL_8580:
 						VPUTSTR("8580");
 						break;
+					case XS_SIDMODEL_ANY:
+						VPUTSTR("ANY");
+						break;
 					default:
-						VPUTSTR("Unknown");
+						VPUTSTR("?");
 						break;
 					}
 					break;
+				case 'C':
+					if (subInfo && (subInfo->tuneSpeed > 0)) {
+						switch (subInfo->tuneSpeed) {
+						case XS_CLOCK_PAL:
+							VPUTSTR("PAL");
+							break;
+						case XS_CLOCK_NTSC:
+							VPUTSTR("NTSC");
+							break;
+						case XS_CLOCK_ANY:
+							VPUTSTR("ANY");
+							break;
+						case XS_CLOCK_VBI:
+							VPUTSTR("VBI");
+							break;
+						case XS_CLOCK_CIA:
+							VPUTSTR("CIA");
+							break;
+						default:
+							g_snprintf(tmpStr, XS_BUF_SIZE,
+							"%iHz", subInfo->tuneSpeed);
+							VPUTSTR(tmpStr);
+						}
+					} else
+						VPUTSTR("?");
+					break;
 				case 'n':
-					snprintf(tmpStr, XS_BUF_SIZE, "%i", iSubTune);
+					g_snprintf(tmpStr, XS_BUF_SIZE, "%i", subTune);
 					VPUTSTR(tmpStr);
 					break;
 				case 'N':
-					snprintf(tmpStr, XS_BUF_SIZE, "%i", nSubTunes);
+					g_snprintf(tmpStr, XS_BUF_SIZE, "%i", p->nsubTunes);
 					VPUTSTR(tmpStr);
 					break;
 				}
-			} else {
+			} else
 				VPUTCH(*pcStr);
-			}
+
 			pcStr++;
 		}