1 files changed, 270 insertions, 16 deletions

diff --git a/src/decoder/sidplay_plugin.cxx b/src/decoder/sidplay_plugin.cxx
index c62e6b4b6..9bfe98f3d 100644
--- a/src/decoder/sidplay_plugin.cxx
+++ b/src/decoder/sidplay_plugin.cxx
@@ -17,18 +17,186 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 extern "C" {
 #include "../decoder_api.h"
 }
 
+#include <errno.h>
+#include <stdlib.h>
 #include <glib.h>
 
 #include <sidplay/sidplay2.h>
 #include <sidplay/builders/resid.h>
+#include <sidplay/utils/SidTuneMod.h>
 
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "sidplay"
 
+#define SUBTUNE_PREFIX "tune_"
+
+static GPatternSpec *path_with_subtune;
+static const char *songlength_file;
+static GKeyFile *songlength_database;
+
+static bool all_files_are_containers;
+static unsigned default_songlength;
+
+static bool filter_setting;
+
+static GKeyFile *
+sidplay_load_songlength_db(const char *path)
+{
+	GError *error = NULL;
+	gchar *data;
+	gsize size;
+
+	if (!g_file_get_contents(path, &data, &size, &error)) {
+		g_warning("unable to read songlengths file %s: %s",
+			  path, error->message);
+		g_error_free(error);
+		return NULL;
+	}
+
+	/* replace any ; comment characters with # */
+	for (gsize i = 0; i < size; i++)
+		if (data[i] == ';')
+			data[i] = '#';
+
+	GKeyFile *db = g_key_file_new();
+	bool success = g_key_file_load_from_data(db, data, size,
+						 G_KEY_FILE_NONE, &error);
+	g_free(data);
+	if (!success) {
+		g_warning("unable to parse songlengths file %s: %s",
+			  path, error->message);
+		g_error_free(error);
+		g_key_file_free(db);
+		return NULL;
+	}
+
+	g_key_file_set_list_separator(db, ' ');
+	return db;
+}
+
+static bool
+sidplay_init(const struct config_param *param)
+{
+	/* read the songlengths database file */
+	songlength_file=config_get_block_string(param,
+		"songlength_database", NULL);
+	if (songlength_file != NULL)
+		songlength_database = sidplay_load_songlength_db(songlength_file);
+
+	default_songlength=config_get_block_unsigned(param,
+		"default_songlength", 0);
+
+	all_files_are_containers=config_get_block_bool(param,
+		"all_files_are_containers", true);
+
+	path_with_subtune=g_pattern_spec_new(
+			"*/" SUBTUNE_PREFIX "???.sid");
+
+	filter_setting=config_get_block_bool(param, "filter", true);
+
+	return true;
+}
+
+void
+sidplay_finish()
+{
+	g_pattern_spec_free(path_with_subtune);
+
+	if(songlength_database)
+		g_key_file_free(songlength_database);
+}
+
+/**
+ * returns the file path stripped of any /tune_xxx.sid subtune
+ * suffix
+ */
+static char *
+get_container_name(const char *path_fs)
+{
+	char *path_container=g_strdup(path_fs);
+
+	if(!g_pattern_match(path_with_subtune,
+		strlen(path_container), path_container, NULL))
+		return path_container;
+
+	char *ptr=g_strrstr(path_container, "/" SUBTUNE_PREFIX);
+	if(ptr) *ptr='\0';
+
+	return path_container;
+}
+
+/**
+ * returns tune number from file.sid/tune_xxx.sid style path or 1 if
+ * no subtune is appended
+ */
+static int
+get_song_num(const char *path_fs)
+{
+	if(g_pattern_match(path_with_subtune,
+		strlen(path_fs), path_fs, NULL)) {
+		char *sub=g_strrstr(path_fs, "/" SUBTUNE_PREFIX);
+		if(!sub) return 1;
+
+		sub+=strlen("/" SUBTUNE_PREFIX);
+		int song_num=strtol(sub, NULL, 10);
+
+		if (errno == EINVAL)
+			return 1;
+		else
+			return song_num;
+	} else
+		return 1;
+}
+
+/* get the song length in seconds */
+static int
+get_song_length(const char *path_fs)
+{
+	if (songlength_database == NULL)
+		return -1;
+
+	gchar *sid_file=get_container_name(path_fs);
+	SidTuneMod tune(sid_file);
+	g_free(sid_file);
+	if(!tune) {
+		g_warning("failed to load file for calculating md5 sum");
+		return -1;
+	}
+	char md5sum[SIDTUNE_MD5_LENGTH+1];
+	tune.createMD5(md5sum);
+
+	int song_num=get_song_num(path_fs);
+
+	gsize num_items;
+	gchar **values=g_key_file_get_string_list(songlength_database,
+		"Database", md5sum, &num_items, NULL);
+	if(!values || song_num>num_items) {
+		g_strfreev(values);
+		return -1;
+	}
+
+	int minutes=strtol(values[song_num-1], NULL, 10);
+	if(errno==EINVAL) minutes=0;
+
+	int seconds;
+	char *ptr=strchr(values[song_num-1], ':');
+	if(ptr) {
+		seconds=strtol(ptr+1, NULL, 10);
+		if(errno==EINVAL) seconds=0;
+	} else
+		seconds=0;
+
+	g_strfreev(values);
+
+	return (minutes*60)+seconds;
+}
+
 static void
 sidplay_file_decode(struct decoder *decoder, const char *path_fs)
 {
@@ -36,13 +204,19 @@ sidplay_file_decode(struct decoder *decoder, const char *path_fs)
 
 	/* load the tune */
 
-	SidTune tune(path_fs, NULL, true);
+	char *path_container=get_container_name(path_fs);
+	SidTune tune(path_container, NULL, true);
+	g_free(path_container);
 	if (!tune) {
 		g_warning("failed to load file");
 		return;
 	}
 
-	tune.selectSong(1);
+	int song_num=get_song_num(path_fs);
+	tune.selectSong(song_num);
+
+	int song_len=get_song_length(path_fs);
+	if(song_len==-1) song_len=default_songlength;
 
 	/* initialize the player */
 
@@ -67,7 +241,7 @@ sidplay_file_decode(struct decoder *decoder, const char *path_fs)
 		return;
 	}
 
-	builder.filter(false);
+	builder.filter(filter_setting);
 	if (!builder) {
 		g_warning("ReSIDBuilder.filter() failed");
 		return;
@@ -103,14 +277,16 @@ sidplay_file_decode(struct decoder *decoder, const char *path_fs)
 	/* initialize the MPD decoder */
 
 	struct audio_format audio_format;
-	audio_format.sample_rate = 48000;
-	audio_format.bits = 16;
-	audio_format.channels = 2;
+	audio_format_init(&audio_format, 48000, SAMPLE_FORMAT_S16, 2);
+	assert(audio_format_valid(&audio_format));
 
-	decoder_initialized(decoder, &audio_format, false, -1);
+	decoder_initialized(decoder, &audio_format, true, (float)song_len);
 
 	/* .. and play */
 
+	const unsigned timebase = player.timebase();
+	song_len *= timebase;
+
 	enum decoder_command cmd;
 	do {
 		char buffer[4096];
@@ -120,30 +296,108 @@ sidplay_file_decode(struct decoder *decoder, const char *path_fs)
 		if (nbytes == 0)
 			break;
 
+		decoder_timestamp(decoder, (double)player.time() / timebase);
+
 		cmd = decoder_data(decoder, NULL, buffer, nbytes,
-				   0, 0, NULL);
-	} while (cmd == DECODE_COMMAND_NONE);
+				   0, NULL);
+
+		if(cmd==DECODE_COMMAND_SEEK) {
+			unsigned data_time = player.time();
+			unsigned target_time = (unsigned)
+				(decoder_seek_where(decoder) * timebase);
+
+			/* can't rewind so return to zero and seek forward */
+			if(target_time<data_time) {
+				player.stop();
+				data_time=0;
+			}
+
+			/* ignore data until target time is reached */
+			while(data_time<target_time) {
+				nbytes=player.play(buffer, sizeof(buffer));
+				if(nbytes==0)
+					break;
+				data_time = player.time();
+			}
+
+			decoder_command_finished(decoder);
+		}
+
+		if (song_len > 0 && player.time() >= song_len)
+			break;
+
+	} while (cmd != DECODE_COMMAND_STOP);
 }
 
 static struct tag *
 sidplay_tag_dup(const char *path_fs)
 {
-	SidTune tune(path_fs, NULL, true);
+	int song_num=get_song_num(path_fs);
+	char *path_container=get_container_name(path_fs);
+
+	SidTune tune(path_container, NULL, true);
+	g_free(path_container);
 	if (!tune)
 		return NULL;
 
 	const SidTuneInfo &info = tune.getInfo();
 	struct tag *tag = tag_new();
 
+	/* title */
+	const char *title;
 	if (info.numberOfInfoStrings > 0 && info.infoString[0] != NULL)
-		tag_add_item(tag, TAG_ITEM_TITLE, info.infoString[0]);
-
+		title=info.infoString[0];
+	else
+		title="";
+
+	if(info.songs>1) {
+		char *tag_title=g_strdup_printf("%s (%d/%d)",
+			title, song_num, info.songs);
+		tag_add_item(tag, TAG_TITLE, tag_title);
+		g_free(tag_title);
+	} else
+		tag_add_item(tag, TAG_TITLE, title);
+
+	/* artist */
 	if (info.numberOfInfoStrings > 1 && info.infoString[1] != NULL)
-		tag_add_item(tag, TAG_ITEM_ARTIST, info.infoString[1]);
+		tag_add_item(tag, TAG_ARTIST, info.infoString[1]);
+
+	/* track */
+	char *track=g_strdup_printf("%d", song_num);
+	tag_add_item(tag, TAG_TRACK, track);
+	g_free(track);
+
+	/* time */
+	int song_len=get_song_length(path_fs);
+	if(song_len!=-1) tag->time=song_len;
 
 	return tag;
 }
 
+static char *
+sidplay_container_scan(const char *path_fs, const unsigned int tnum)
+{
+	SidTune tune(path_fs, NULL, true);
+	if (!tune)
+		return NULL;
+
+	const SidTuneInfo &info=tune.getInfo();
+
+	/* Don't treat sids containing a single tune
+		as containers */
+	if(!all_files_are_containers && info.songs<2)
+		return NULL;
+
+	/* Construct container/tune path names, eg.
+		Delta.sid/tune_001.sid */
+	if(tnum<=info.songs) {
+		char *subtune= g_strdup_printf(
+			SUBTUNE_PREFIX "%03u.sid", tnum);
+		return subtune;
+	} else
+		return NULL;
+}
+
 static const char *const sidplay_suffixes[] = {
 	"sid",
 	NULL
@@ -152,12 +406,12 @@ static const char *const sidplay_suffixes[] = {
 extern const struct decoder_plugin sidplay_decoder_plugin;
 const struct decoder_plugin sidplay_decoder_plugin = {
 	"sidplay",
-	NULL, /* init() */
-	NULL, /* finish() */
+	sidplay_init,
+	sidplay_finish,
 	NULL, /* stream_decode() */
 	sidplay_file_decode,
 	sidplay_tag_dup,
-	NULL, /* container_scan */
+	sidplay_container_scan,
 	sidplay_suffixes,
 	NULL, /* mime_types */
 };