# HG changeset patch # User Matti Hamalainen # Date 1073738640 0 # Node ID 63cf9b2ddadf2d91ddf134baad120783b4d13ca4 # Parent 2607683bc9eb80ed2c34558f1a220bc2649f8889 Minor changes diff -r 2607683bc9eb -r 63cf9b2ddadf NEWS --- a/NEWS Tue Nov 18 18:30:02 2003 +0000 +++ b/NEWS Sat Jan 10 12:44:00 2004 +0000 @@ -10,9 +10,9 @@ in HVSC, VARIOUS/A-F/Brite-Lite/ and visit the Dekadence web-experience: http://www.dekadence64.org/ -* Support for libSIDPlay 2.x! If you have 1.x too, you - can select which one to compile in via "configure" - options --with-sidplay1 and --with-sidplay2. +* Support for multiple emulator libraries, including + libSIDPlay 2.x! See the "configure" options, if you + have problems with autodetection. * HVSC song-length database support. XMMS-SID now supports the XSIDPLAY's song-length database for tunes contained @@ -37,11 +37,11 @@ to have SID-specific titles. See the configuration dialog for more information. -* New SIDAmp-style sub-song selector window. Does not - require patching of XMMS, so this is easier to use. - The patch is not used by XMMS-SID, but included for - those who want the additional functionality it provides - for other plugins. +* New sub-song control. Does not require patching of XMMS, + so this is easier to use. The patch is supported too, if + found, but it's not "required" anymore. It's still handy + for those who want the additional functionality it + provides for other plugins. * Throw in a handful of bugfixes (and possibly new bugs), stir powerfully. Finally, sprinkle some minor improvements diff -r 2607683bc9eb -r 63cf9b2ddadf README --- a/README Tue Nov 18 18:30:02 2003 +0000 +++ b/README Sat Jan 10 12:44:00 2004 +0000 @@ -1,10 +1,6 @@ XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS) ============================================================== -(C) Copyright 2001-2003 Matti 'ccr/TNSP' Hämäläinen - (versions from v0.5 up to current) - -(C) Copyright 1999 Willem Monsuwe - (versions up to v0.4) +(C) Copyright 2003 Matti 'ccr/TNSP' Hämäläinen "XMMS-SID Theme"-song (SIDtune) by Peter 'Brite-Lite' Halin of Dekadence @@ -22,9 +18,8 @@ support for playing the so-called "SID tunes", which are music from old Commodore computer programs like games, demos, etc. -For the actual playing, XMMS-SID uses the excellent libsidplay (1|2) -emulator engine that emulates 6510 CPU and 6581/8580 Sound Interface -Device (SID) chip. +For the actual playing, XMMS-SID can use numerous emulator engines, +including the excellent libSIDPlay v1 and v2. Usage diff -r 2607683bc9eb -r 63cf9b2ddadf configure.in --- a/configure.in Tue Nov 18 18:30:02 2003 +0000 +++ b/configure.in Sat Jan 10 12:44:00 2004 +0000 @@ -6,7 +6,7 @@ AC_PREREQ(2.56) dnl Initialize -AC_INIT(XMMS-SID, 0.8.0beta5, ccr@tnsp.org) +AC_INIT(XMMS-SID, 0.8.0beta6, ccr@tnsp.org) AC_COPYRIGHT([[(C) 2002-2003 Matti 'ccr' Hämäläinen]]) AC_CONFIG_SRCDIR(src/xmms-sid.h) AM_INIT_AUTOMAKE diff -r 2607683bc9eb -r 63cf9b2ddadf src/xs_sidplay.h --- a/src/xs_sidplay.h Tue Nov 18 18:30:02 2003 +0000 +++ b/src/xs_sidplay.h Sat Jan 10 12:44:00 2004 +0000 @@ -27,23 +27,23 @@ } /* Split the filename into path */ - sFilePath = g_strdup(songFilename); + sFilePath = g_strdup(pcFilename); sFileName = strrchr(sFilePath, '/'); if (sFileName) sFileName[1] = 0; /* Filename */ - sFileName = strrchr(songFilename, '/'); + sFileName = strrchr(pcFilename, '/'); if (sFileName) sFileName = g_strdup(sFileName + 1); else - sFileName = g_strdup(songFilename); + sFileName = g_strdup(pcFilename); sFileExt = strrchr(sFileName, '.'); sFileExt[0] = 0; /* Extension */ - sFileExt = strrchr(songFilename, '.'); + sFileExt = strrchr(pcFilename, '.'); /* FIXME FIXME: get STIL-information */ @@ -139,7 +139,7 @@ t_xs_tune *pResult; TTUNEINFO tuneInfo; TTUNE *testTune; - gboolean haveInfo; + gboolean haveInfo = false; gint i; /* Check if the tune exists and is readable */ diff -r 2607683bc9eb -r 63cf9b2ddadf src/xs_sidplay2.cc --- a/src/xs_sidplay2.cc Tue Nov 18 18:30:02 2003 +0000 +++ b/src/xs_sidplay2.cc Sat Jan 10 12:44:00 2004 +0000 @@ -199,7 +199,7 @@ { t_xs_sidplay2 *myPlayer = (t_xs_sidplay2 *) myStatus->player; - return (myPlayer->currEng->play(audioBuffer, audioBufSize) == audioBufSize); + return (myPlayer->currEng->play(audioBuffer, audioBufSize) == (guint) audioBufSize); } diff -r 2607683bc9eb -r 63cf9b2ddadf xmms-sid.spec.in --- a/xmms-sid.spec.in Tue Nov 18 18:30:02 2003 +0000 +++ b/xmms-sid.spec.in Sat Jan 10 12:44:00 2004 +0000 @@ -1,59 +1,63 @@ +########################################################### %define name @PACKAGE@ %define version @VERSION@ %define release 1 -%define serial 1 -Summary: XMMS-SID - SIDPlay plugin for XMMS +Summary: A SID-tune (C64 music) input plugin for XMMS Name: %{name} Version: %{version} Release: %{release} -Serial: %{serial} Copyright: GPL Group: Applications/Multimedia Vendor: Matti "ccr/TNSP" Hamalainen Url: http://www.tnsp.org/xmms-sid.php -Source: %{name}-%{version}.tar.gz -BuildRoot: %{_tmpdir}/%{name}-%{version}-root +Source: http://www.tnsp.org/xs-files/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: gtk+ >= 1.2.8, glib >= 1.2.8, xmms = @XMMS_VERSION@ Requires: @REQUIRE_LIBRARY@ +########################################################### %description -Input plugin for XMMS to play SID-tunes (C64 music files). -Requires either (or both) libSIDPlay v1.x or v2.x. Includes -good configurability (settings for filters and other SID- -emulation parameters, extensive fileinfo), has STIL-database -support, song-length database support and more. +Input plugin for XMMS to play SID-tunes (Music from Commodore +64 games/demos/etc.). Supports either (or both) libSIDPlay +v1.x or v2.x. Includes extensive configurability (settings for +filters and other SID-emulation parameters, extensive fileinfo), +has STIL-database support, song-length database support and more. +%description -l de +Input-Plugin für XMS um SID-musiken (Musik aus Commodore64 Spielen, +Demos, etc) abzuspielen. Unterstützt entweder libSidPlay V1.x, V2.x +oder beide. Enthält erweiterte Konfiguriermöglichkeiten, wie +Filtereinstellungen, diverse Parameter für die SID-Emulation und +ausführlichere Fileinformationen), Unterstützung der STIL Datenbank, +Song-Längen Datenbank und vieles mehr. + +########################################################### %prep %setup -q +########################################################### %build export CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"; +%configure +make -./configure \ - --prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir} --bindir=%{_bindir} \ - --libdir=%{_libdir}/xmms/Input --datadir=%{_datadir} \ - --includedir=%{_includedir} - -gmake - +########################################################### %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -gmake PREFIX=$RPM_BUILD_ROOT%{_prefix} \ - prefix=$RPM_BUILD_ROOT/%{_prefix} \ - sysconfdir=$RPM_BUILD_ROOT/%{_sysconfdir} \ - bindir=$RPM_BUILD_ROOT/%{_bindir} \ - libdir=$RPM_BUILD_ROOT/%{_libdir}/xmms/Input \ - datadir=$RPM_BUILD_ROOT/%{_datadir} \ - includedir=$RPM_BUILD_ROOT/%{_includedir} install +%makeinstall +########################################################### %post -p /sbin/ldconfig + +########################################################### %postun -p /sbin/ldconfig +########################################################### %clean -[ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +[ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT +########################################################### %files %defattr(-, root, root) %doc AUTHORS COPYING FAQ NEWS README* THANKS TODO BUGS