comparison src/sid/xmms-sid.c @ 1564:5e4393a4c099

Start of major Aud-SID Tuples vs XMMS-SID cleanup.

1563:828f45d8e8f8

#include <gtk/gtk.h>

#include "xs_config.h"
#include "xs_length.h"
#include "xs_stil.h"
#include "xs_title.h"
#include "xs_filter.h"
#include "xs_fileinfo.h"
#include "xs_interface.h"
#include "xs_glade.h"
#include "xs_player.h"

	InputPlayback *pb = argPointer;
	t_xs_status myStatus;
	t_xs_tuneinfo *myTune;
	gboolean audioOpen = FALSE, doPlay = FALSE, isFound = FALSE;
	gint audioGot, songLength, i;
	gchar *audioBuffer = NULL, *oversampleBuffer = NULL, *tmpTitle;

	(void) argPointer;

	/* Initialize */
	XSDEBUG("entering player thread\n");

		audioOpen = TRUE;

		/* Set song information for current subtune */
		XSDEBUG("set tune info\n");
		myStatus.sidPlayer->plrUpdateSIDInfo(&myStatus);
		tmpTitle = xs_make_titlestring(myTune, myStatus.currSong);
		
		xs_plugin_ip.set_info(
			tmpTitle,
			(songLength > 0) ? (songLength * 1000) : 0,
			-1,
			myStatus.audioFrequency,
			myStatus.audioChannels);
		
		g_free(tmpTitle);
		
		XSDEBUG("playing\n");

		/*
		 * Play the subtune
		 */

	/* Return output time reported by audio output plugin */
	return pb->output->output_time();
}


/* Return song information: called by XMMS when initially loading the playlist.
 * Subsequent changes to information are made by the player thread,
 * which uses xs_plugin_ip.set_info();
 */
void xs_get_song_info(gchar * songFilename, gchar ** songTitle, gint * songLength)

	/* Free tune information */
	xs_tuneinfo_free(pInfo);
	XS_MUTEX_UNLOCK(xs_status);
}


t_xs_tuple * xs_get_song_tuple(gchar *songFilename)
{
	t_xs_tuneinfo *pInfo;
	t_xs_tuple *pResult = NULL;

	XS_MUTEX_LOCK(xs_status);

	/* Get tune information from emulation engine */
	pInfo = xs_status.sidPlayer->plrGetSIDInfo(songFilename);
	if (!pInfo) {
		XS_MUTEX_UNLOCK(xs_status);
		return NULL;
	}

	/* Get sub-tune information, if available */
	if ((pInfo->startTune > 0) && (pInfo->startTune <= pInfo->nsubTunes)) {
		gint tmpInt;
		
		pResult = xs_make_titletuple(pInfo, pInfo->startTune);

		tmpInt = pInfo->subTunes[pInfo->startTune-1].tuneLength;
#ifdef AUDACIOUS_PLUGIN
		if (tmpInt < 0)
			tuple_associate_int(pResult, "length", -1);
		else
		   tuple_associate_int(pResult, "length", tmpInt * 1000);
#else
		if (tmpInt < 0)
			pResult->length = -1;
		else
			pResult->length = (tmpInt * 1000);
#endif
	}

	/* Free tune information */
	xs_tuneinfo_free(pInfo);

	XS_MUTEX_UNLOCK(xs_status);

	return pResult;
}


/* Allocate a new tune information structure
 */
t_xs_tuneinfo *xs_tuneinfo_new(const gchar * pcFilename,

1564:5e4393a4c099

#include <gtk/gtk.h>

#include "xs_config.h"
#include "xs_length.h"
#include "xs_stil.h"
#include "xs_filter.h"
#include "xs_fileinfo.h"
#include "xs_interface.h"
#include "xs_glade.h"
#include "xs_player.h"

	InputPlayback *pb = argPointer;
	t_xs_status myStatus;
	t_xs_tuneinfo *myTune;
	gboolean audioOpen = FALSE, doPlay = FALSE, isFound = FALSE;
	gint audioGot, songLength, i;
	gchar *audioBuffer = NULL, *oversampleBuffer = NULL;
	Tuple *tmpTitle;

	(void) argPointer;

	/* Initialize */
	XSDEBUG("entering player thread\n");

		audioOpen = TRUE;

		/* Set song information for current subtune */
		XSDEBUG("set tune info\n");
		myStatus.sidPlayer->plrUpdateSIDInfo(&myStatus);
/*
		tmpTitle = xs_make_titlestring(myTune, myStatus.currSong);
		
		xs_plugin_ip.set_info(
			tmpTitle,
			(songLength > 0) ? (songLength * 1000) : 0,
			-1,
			myStatus.audioFrequency,
			myStatus.audioChannels);
		
		g_free(tmpTitle);
*/		
		XSDEBUG("playing\n");

		/*
		 * Play the subtune
		 */

	/* Return output time reported by audio output plugin */
	return pb->output->output_time();
}


#ifndef AUDACIOUS_PLUGIN
/* Return song information: called by XMMS when initially loading the playlist.
 * Subsequent changes to information are made by the player thread,
 * which uses xs_plugin_ip.set_info();
 */
void xs_get_song_info(gchar * songFilename, gchar ** songTitle, gint * songLength)

	/* Free tune information */
	xs_tuneinfo_free(pInfo);
	XS_MUTEX_UNLOCK(xs_status);
}

#else

Tuple * xs_get_song_tuple(gchar *songFilename)
{
	t_xs_tuneinfo *pInfo;
	Tuple *pResult;
	gchar *tmpStr;

	XS_MUTEX_LOCK(xs_status);

	pResult = tuple_new_from_filename(songFilename);

	/* Get tune information from emulation engine */
	pInfo = xs_status.sidPlayer->plrGetSIDInfo(songFilename);
	if (!pInfo) {
		XS_MUTEX_UNLOCK(xs_status);
		return pResult;
	}

	tuple_associate_string(pResult, "title", pInfo->sidName);
	tuple_associate_string(pResult, "artist", pInfo->sidComposer);
	tuple_associate_int(pResult, "track-number", pInfo->startTune);
	tuple_associate_string(pResult, "genre", "SID-tune");
	tuple_associate_string(pResult, "copyright", pInfo->sidCopyright);
	tuple_associate_string(pResult, "format", pInfo->sidFormat);
	tuple_associate_int(pResult, "subtunes", pInfo->nsubTunes);

	switch (pInfo->sidModel) {
		case XS_SIDMODEL_6581: tmpStr = "6581"; break;
		case XS_SIDMODEL_8580: tmpStr = "8580"; break;
		case XS_SIDMODEL_ANY: tmpStr = "ANY"; break;
		default: tmpStr = "?"; break;
	}
	tuple_associate_string(pResult, "sid-model", tmpStr);

	/* Get sub-tune information, if available */
	if ((pInfo->startTune > 0) && (pInfo->startTune <= pInfo->nsubTunes)) {
		gint tmpInt = pInfo->subTunes[pInfo->startTune-1].tuneLength;
		tuple_associate_int(pResult, "length", (tmpInt < 0) ? -1 : tmpInt * 1000);
		
	}

	/* Free tune information */
	xs_tuneinfo_free(pInfo);
	XS_MUTEX_UNLOCK(xs_status);
	return pResult;
}
#endif


/* Allocate a new tune information structure
 */
t_xs_tuneinfo *xs_tuneinfo_new(const gchar * pcFilename,