# HG changeset patch # User Matti Hamalainen # Date 1054639505 0 # Node ID e5c49367b899b5404032fd62cf7da442b2616c5e # Parent ff6b3a556a15caa9990efe8fc0bb257bc88a6506 Updated to 0.8 diff -r ff6b3a556a15 -r e5c49367b899 AUTHORS --- a/AUTHORS Tue Jun 03 11:19:04 2003 +0000 +++ b/AUTHORS Tue Jun 03 11:25:05 2003 +0000 @@ -1,10 +1,10 @@ -xmms-sid - SIDPlay input plugin for X MultiMedia System (XMMS) +XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS) ============================================================== - -Original xmms-sid author: Willem Monsuwe +Matti "ccr/TNSP" Hamalainen - Author and maintainer since v0.5. +Willem Monsuwe - Original XMMS-SID creator and author. -This branch (post v0.4) authored and maintained by -Matti "ccr/TNSP" Hamalainen +Implementation of MD5 (RFC 1321) by L. Peter Deutsch +(C) Copyright 1999 Aladdin Enterprises, all rights reserved. +(NOTICE: The included code for MD5 is (?) licensed compatibly +with GNU GPL, but you may NOT change the license to GPL!) -Special thanks to Michael Schwendt for making libsidplay. - diff -r ff6b3a556a15 -r e5c49367b899 BUGS --- a/BUGS Tue Jun 03 11:19:04 2003 +0000 +++ b/BUGS Tue Jun 03 11:25:05 2003 +0000 @@ -1,13 +1,13 @@ -Known bugs -========== +XMMS-SID - Known bugs +===================== -* Not really xmms-sid bug, but since it affects us: +* There _may_ be some endianess problems that I'm not aware of. + PLEASE bugger me, if you notice any! :) + - The default xmms-config script created by XMMS package is faulty. - It does not properly accept the --prefix parameter (it does not affect - the paths outputted by it) and therefore, due to how the rpm building - works (changes the --prefix to the build directory) it is impossible - (currently) to make a working RPM .spec-file without spurious kludging. +* See FAQ for information on few "known features". + - I am not interested to make these kludges and so this is why the .spec - for xmms-sid does not produce a RPM package file. +* Also visit XMMS-SID's homepage (http://www.tnsp.org/xmms-sid.php) for + most current information and latest news. + diff -r ff6b3a556a15 -r e5c49367b899 ChangeLog --- a/ChangeLog Tue Jun 03 11:19:04 2003 +0000 +++ b/ChangeLog Tue Jun 03 11:25:05 2003 +0000 @@ -1,43 +1,152 @@ -2002-09-02 Matti Hämäläinen (ccr/TNSP) +2002-10-30 Matti Hämäläinen (ccr/TNSP) + + * Updated GNU autoconf to 2.54, automake to 1.7.1 + and libtool to latest CVS-version. + + * Improvements in configure.ac - * version 0.7.4 + * Re-arranged docs some. + +2002-10-20 Matti Hämäläinen (ccr/TNSP) + + * Incredible amount of remodelling done. + Now uses glade-generated C-files directly. + + * Bugfixes included from 0.7-series. - * Patch from Euan MacGregor to fix bug with - "Determine filetype by contents" option enabled - crashing XMMS-SID when trying to play a file - that does not exist. Thanks! + * New documentation, updated FAQ. + +2002-05-05 Matti Hämäläinen (ccr/TNSP) + + * xs_config.c: we must not free() data got from + textfield-widgets. Changed to xs_calloc() them. + (Fixed segfault when constantly re-opening the + configuration-dialog.) + + +2002-05-04 Matti Hämäläinen (ccr/TNSP) + + * Improved documentation lot. + + * Some nasty bugs in core code, debugging ... + +2002-05-01 Matti Hämäläinen (ccr/TNSP) - * Fixed a bug in About-dialog, patch from OpenBSD - project's PortsPlus tree. Thanks BSD-guys! :) + * Lots of work on cleaning up the mess left + from the major rewrites ... + + * Disabled parts of code to ease testing. + + * Started integration of experimental support + for libsidplay2. + +2002-03-21 Matti Hämäläinen (ccr/TNSP) + + * Implemented routines for reading HVSC Songlength + database. (Still need to think of memory management + issues.) + + * Added xs_close() for cleanups. TODO: check all + memory leaks and other things to be "shut down" + in the plugin. - * Fixed free() of internal Gtk-data in config-dialog, - which caused crash if opening+closing config-dialog - multiple times. + +2002-03-20 Matti Hämäläinen (ccr/TNSP) + + Loads of work, cleanups, etc. + + - The configuration dialog starts to be finished .. + Few arrangements were done to make it more reasonably + and new config items were added for the new options. - * Added in LE->NE 16-bit audioformat patch from - OpenBSD-project. I'm not entirely sure what's the - difference, but it did not break at least Linux/x86. :) + - Integrated the new config-dialog code. + + * version 0.8alpha0 + +2001-11-25 Matti (ccr/TNSP) Hamalainen + + * Lots of cleanups. + + * xs_title.c: General fixes, trying to get + generic title support to work... - * Added in updated songpos-patch for XMMS 1.2.7 + * Worked on the configuration dialog. -2002-02-26 Matti (ccr/TNSP) Hamalainen +2001-11-22 Matti (ccr/TNSP) Hamalainen - * version 0.7.3 - - * Fixed to work with latest libsidplay, needed - to add linking to libstdc++. + * Lots of cleanups, now compiles again. + (Yes, I've been somewhat lazy for a while) -2001-11-18 Matti (ccr/TNSP) Hamalainen +2001-11-17 Matti (ccr/TNSP) Hamalainen + + * Changed to libtool 1.4 + +2001-09-12 Matti (ccr/TNSP) Hamalainen + + * xs_md5.*: Changed to use glib guint8/guint32. + Cleaned up the sources slightly. + +2001-08-29 Matti (ccr/TNSP) Hamalainen + + * Added xs_md5.c, xs_md5.h, xs_length.c to start + implementing the song-length support. + + * Source now in local CVS due to some hassle. - * version 0.7.2 + A long programming session followed by sleepy + let's-remove-the-~-files. + + Guess what? The tilde key did not work for that + time. Result: "rm -f *" instead of "rm -f *~". + What a STUPID STUPID mistake. - * Updated libtool to v1.4 + Fortunately, the ext2fs undeletion HOW-TO with + some debugfs-magic worked and I didn't have to + start again with week-old backups :) + + *whew* (First time for me that something like + this happened. Hopefully also the last time.) + +2001-08-20 Matti (ccr/TNSP) Hamalainen + + * Fixed some indentations. - * Again fixed the song-pos patch. Sorry. + * Makefile.am: Removed duplicate xmms-sid.spec + +2001-08-19 Matti (ccr/TNSP) Hamalainen + + * Updated all documents to new e-mail address + and new TNSP e-mail address + . + + * Added in the RPM .spec-file. + + * Lots of source cleanups. + + * Added xs_support.c and xs_title.c. + + * xs_title.c: Worked on global title support. + +2001-08-15 Matti (ccr/TNSP) Hamalainen - * Minor fixes backported from 0.8-betas + * configure.in: Improved general structure, show + information about options when finished succesfully, + detect XMMS >= 1.2.5 and enable extra features, + option --enable-subsongsel + + * Worked on new configuration dialog. + + * Started work on changing the internals of STIL-system. -2001-07-20 Matti (ccr/TNSP) Hamalainen + * Started work on adding the song-length support. + + * Removed an erratic kludge from songpos-patch v1.2.5. + +2001-07-19 Matti (ccr/TNSP) Hamalainen + + * Improved README, added "usage"-section. + +2001-07-16 Matti (ccr/TNSP) Hamalainen * Uh oh. The v0.7 release version's song-position patch (v1.2.4 one) was flawed. It was against CVS @@ -49,20 +158,11 @@ (aka comments out) an unused(??) function that caused trouble when compiling XMMS 1.2.5 under RH7.1. - * Fixed a bug in STIL COMMENT-parsing. There must be - a whitespace between after line end. - -2001-07-19 Matti (ccr/TNSP) Hamalainen - - * Improved README, added "usage"-section. - -2001-07-16 Matti (ccr/TNSP) Hamalainen - * Improved README.songpos documentation. 2001-06-24 Matti (ccr/TNSP) Hamalainen - * Started working on new version, 0.8beta0 ... + * Started working on new version, 0.8 ... * Designed additions to configuration dialog. @@ -273,7 +373,7 @@ configuration system now works and it should be easier to modify the variables, etc. -2000-09-27 Matti (ccr/TNSP) Hamalainen +2000-09-27 Matti (ccr/TNSP) Hamalainen * Configuration dialog: Added STIL settings. Stil bugs somewhat, the cancel-button does not diff -r ff6b3a556a15 -r e5c49367b899 INSTALL --- a/INSTALL Tue Jun 03 11:19:04 2003 +0000 +++ b/INSTALL Tue Jun 03 11:25:05 2003 +0000 @@ -1,8 +1,23 @@ Requirements ============ - XMMS version 1.2.0 or later (http://www.xmms.org/) -- libsidplay 1.36.xx or later (preferably latest version) -- Gtk+ and Glib 1.2.2 or later (http://www.gtk.org/) + +- Gtk+ and Glib 1.2.8 or later (http://www.gtk.org/) + +- C and C++-compiler. Preferably gcc and g++, I have + no idea whether this compiles with any other + compilers ... sorry. + +- You need either or both of the following: + * libsidplay1 v1.36.xx (or later version) + * libsidplay2 v2.0.7 (NO LATER OR EARLIER VERSIONS!) + + NOTICE! You need at least v1 or v2, OR BOTH. + + +Earlier versions may or may not work; you may try, +but you'll need to edit configure.in for smaller +version numbers and then run autogen.sh. Where to get XMMS? @@ -15,11 +30,8 @@ on it's usage and installation (etc). -Where to get libsidplay? +Where to get libSIDPlay? ======================== -XMMS-SID requires the libsidplay to play the SID tunes -(as XMMS-SID is just an "libsidplay interface for XMMS"). - The library is available at SIDPlay's homepage: http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/ @@ -27,29 +39,35 @@ You only need libsidplay, the sidplay-base is not necessary if you are sure that you don't need the commandline player. -(NOTICE!!! XMMS-SID cannot use sidplay2 as it is completely -different from sidplay v1!! Support may be added in future, -however.) +Where to get libSIDPlay2? +========================= +The library is available at SourceForge: + +http://sidplay2.sourceforge.net/ + +NOTICE! Compiling sidplay2 may or may not be cumbersome, +since it is still heavily under development. Take care. -Installing xmms-sid +Installing XMMS-SID =================== +When you have the requirements installed and working +succesfully, you can try compiling XMMS-SID. + +Invoke configure-script (use parameter --help for help) + +$ ./configure -Simply run the following commands: + +If configure went without errors, try compilation: -./configure -make -make install +$ make + +If that went OK too, then you may try installation: + +# make install (Run "make install" as superuser/root if you are installing for the whole system.) -Notes -===== -* If "configure" script is not present, run ./autogen.sh - -* The configure script uses xmms-config to guess the correct location - to install the plugin files (.so and .la). If you want to install them - to another place, run configure with --libdir= option. - diff -r ff6b3a556a15 -r e5c49367b899 Makefile.am --- a/Makefile.am Tue Jun 03 11:19:04 2003 +0000 +++ b/Makefile.am Tue Jun 03 11:25:05 2003 +0000 @@ -1,5 +1,5 @@ -# Require automake 1.4 -AUTOMAKE_OPTIONS = 1.4 +# Require latest automake +AUTOMAKE_OPTIONS = 1.7 # Directories to be BUILT and INSTALLED SUBDIRS = src @@ -9,12 +9,14 @@ # All the rest of the distributed files EXTRA_DIST = \ - xmms-songpos.patch-1.2.2 \ - xmms-songpos.patch-1.2.5 \ - xmms-songpos.patch-1.2.7 \ acsidplay.m4 \ - xmms-sid.glade \ - README.songpos \ + FAQ \ README.bugreport \ BUGS \ - autogen.sh + THANKS \ + autogen.sh \ + xmms-songpos.patch \ + xmms-sid.glade \ + xmms-sid.spec.in \ + xmms-sid.spec \ + pixmaps diff -r ff6b3a556a15 -r e5c49367b899 NEWS --- a/NEWS Tue Jun 03 11:19:04 2003 +0000 +++ b/NEWS Tue Jun 03 11:25:05 2003 +0000 @@ -1,8 +1,74 @@ -xmms-sid - SIDPlay input plugin for X MultiMedia System (XMMS) +XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS) ============================================================== List of user-visible changes in XMMS-SID (See ChangeLog for more complete listing of changes) +Version 0.8 +=========== +* Theme-song (SID-tune!) from Brite-Lite/Dekadence! + Thanks for great work! Listen to his other tunes + 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 use in the configuration + dialog. + +* Song-length support! Several methods supported: + + - Maximum playtime setting. If set ON, song will be + played for given time. This can be used as a + fall-back method if a detection is selected, but + it fails. + + 1) No song-length detection. XMMS-SID plays the song + forever, OR if max-playtime is set, for that time. + + 2) Pseudo-heuristic silence detector. + Allows the user to define a "silent time limit" + with amplitude percentage. When the average output + volume has stayed on specified percentage for + specified time, next song is started. + + 3) HVSC song-length database support. XMMS-SID now + supports the XSIDPLAY's song-length database for + tunes contained in HVSC collection. This is + probably the best option, but requires downloading + of a small package (few hundred kB's), that contains + the database. Read "README" for more info. + + +* Improved file information dialog: + + - Coloring in "comment"-field, if multiple entries + are present there. + + - Sub-song "name" or "title" is shown (if any) in the + sub-song selector. If "name" is found for the song, + it is shown, if not, then "title" is checked for + and shown if found. + + +* XMMS v1.2.5 introduced the "generic title format" that + can be used to have same format titles for those + plugins that support it. XMMS-SID is now one of them. + There is also an overriding option, that enables you + 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. + + +* Throw in a handful of bugfixes (and possibly new bugs), + stir powerfully. Finally, sprinkle some minor improvements + on the top and voéla! + + Version 0.7 =========== * Much improved file information dialog. Now shows all relevant @@ -25,15 +91,15 @@ =========== Improved configuration: - - Filters are now configurable, you can adjust all three - parameters of libsidplay: FS, FM and FT. See "Filter" - panel of configuration dialog. +* Filters are now configurable, you can adjust all three + parameters of libsidplay: FS, FM and FT. See "Filter" + panel of configuration dialog. - - STIL database path can be set and STIL usage can be enabled - and disabled from configuration dialog's "STIL" panel. +* STIL database path can be set and STIL usage can be enabled + and disabled from configuration dialog's "STIL" panel. - - Songname / info is now configurable like in the mpg123 plugin, - with %1..%n, see the "STIL" panel of configuration dialog. +* Songname / info is now configurable like in the mpg123 plugin, + with %1..%n, see the "STIL" panel of configuration dialog. Version 0.5 diff -r ff6b3a556a15 -r e5c49367b899 README --- a/README Tue Jun 03 11:19:04 2003 +0000 +++ b/README Tue Jun 03 11:25:05 2003 +0000 @@ -1,121 +1,52 @@ -xmms-sid - SIDPlay input plugin for X MultiMedia System (XMMS) +XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS) ============================================================== - -XMMS-SID is originally by Willem Monsuwe. -Additional fixes, features added were added by -Matti "ccr" Hamalainen of Tecnic Software productions (TNSP), -who also nowadays maintains this package. +(C) Copyright 2002-2003 Matti 'ccr/TNSP' Hämäläinen + (versions from v0.5 up to current) -!! NOTICE: Please do not contact Willem about this version, -since the bugs and quirks are probably made by me (ccr) now. !! - -General Introduction -==================== -XMMS-SID is a plugin for XMMS (X MultiMedia System) which provides -support for playing the so-called "SID tunes". For the actual playing, -XMMS-SID uses the excellent libsidplay SID-chip/6502 emulator engine. -(See "INSTALL" where to get libsidplay) - -If you are not familiar with the term "SID tune" or "SID" concept at -all, a short (yes it is! ;-) explanation follows: +(C) Copyright 1999 Willem Monsuwe + (versions up to v0.4) -SID is the sound chip that was used in many of the old 8-bit home -computers manufactured by Commodore Inc. in 1980's. Best known of -those was the Commodore 64 home computer (aka C64 or CBM64, also -known as VIC-64 in some countries). - +"XMMS-SID Theme"-song (SIDtune) + by Peter 'Brite-Lite' Halin of Dekadence + (C) Copyright 2002 Dekadence + -The Sound Interface Device (SID) was one of the most advanced sound -chips at the time. It's capabilities surpassed all of the other chips -on the 8-bit home computer market and even most of the ones used in -arcade game systems. Thousands of games were produced for C=64 in -1980's and beginning of 1990's, many of them having excellent musical -score. Best of those tunes are still regarded at least legendary, -such as songs by Martin Galway (for games Arkanoid, Green Beret, -Yie Ar Kung Fu 1 & 2, Parallax...), Rob Hubbard (Commando, Auf -Wiedersehen Monty, Monty on the Run, Warhawk, Sanxion, Delta...), -Ben Daglish (Jack the Nipper 1&2, Way of the Tiger, Cobra, Avenger...) -and numerous other legendary composers. Some of them quit their -composing quickly after the 8-bit period, but some are still working -in the computer music business. (Like Maniacs of Noise, Chris -Huelsbeck, Richard Joseph and ex. MON member Charles Deenen who -worked with Fallout 1's musical score) +MD5 Algorithm code for song-length database handling + by L. Peter Deutsch + (C) Copyright 1999 Aladdin Enterprises. All rights reserved. -Today, years after the decline of 8-bit computers, many composers -(mainly from C64 demoscene) continue to compose tunes for SID and -get most amazing things out of it -- things that the designers of -the SID would have never believed. - -For example: SID has only three sound channels, but there are tunes -that use special techniques to "multiplex" them to sound like four -or even six channels. Also these three channels are "limited" to -synthesized sounds, kind like the FM sounds produced by old Sound Blaster -cards on PC. But again, using a certain 'bug' in SID chip, composers -were able to push the limits farther ... Martin Galway's very famous -piece on Arkanoid game was the "first" (later it has been proven that -Chris Huelsbeck's Bad Cat was the first but was released later) to -feature DIGITIZED SAMPLES like speech, etc. - -... - -So this is the story in short. The "SID tunes" are usually understood -to be the files that contain the C64 machine code and data that plays -the music. SID players (or emulators) are programs that emulate the -SID chip capabilities and other parts of C64 hardware to produce -almost authentic re-creation of the original music. SID-files (aka -SID tunes) can be created by ripping the music routines and data from -some game or just composing the music with some editor. +Short Introduction +================== +XMMS-SID is a plugin for XMMS (X MultiMedia System) which provides +support for playing the so-called "SID tunes", which are music +from old Commodore computer programs like games, demos, etc. -XMMS-SID is interface for one of those emulators, probably the best -one: (lib)SIDPlay by Michael Schwendt. - -... - -Hopefully I didn't make you bored with my chit-chat :) - --ccr/TNSP - +For the actual playing, XMMS-SID uses the excellent libsidplay (1|2) +SID-chip/6502 emulator engine that emulates 6510 CPU and 6581/8580 +Sound Interface Device (SID) chip. -Where to get SID tunes? -======================= -There are many collections of SID tunes on the Internet, but -probably the best one and best known one is the High Voltage -SID Collection aka HVSC. - -It is available at: http://hvsc.c64.org/ - -HVSC contains the tunes ripped from all legendary C64 games, -loaders, etc. And more. There are over 15,000 tunes in the -HVSC version 4.0 and more are coming. HVSC also contains the -STIL database (SID Tune Information List) that contains lots -of information about many of the tunes included in HVSC. -XMMS-SID supports the STIL database and info about the playing -tune can be viewed with the "XMMS fileinfo" window (CTRL+3). -STIL information can contain comments from composers, information -about if the tune is a cover and historically interesting facts -about games, etc... +If you are not familiar with the term "SID tune" or "SID" concept +at all, please read the longer introduction in the FAQ! Usage ===== -Using the plugin is quite simple, if you are familiar with XMMS, -then you already know how to use XMMS-SID. The configuration of -the plugin should be quite self-explanatory and the default settings -are usually satisfactory. The only thing that you probably -need to touch in the config dialog is the "STIL-database path"-setting, -if you have the HVSC-collection and want to use STIL-database. +Using the plugin is quite simple: if you are familiar with XMMS and +SIDPlay, then you already know how to use XMMS-SID. Configuration +should be self-explanatory, here are few tips: + +* SIDPlay2-emulation is harder, but more accurate. So you need to have + more CPU-power for it. -Simply point the STIL-db path to "STIL.txt"-file that resides -under "DOCUMENTS"-subdirectory of HVSC-rootdir. For example, -I use the following path: "/usr/src/C64Music/DOCUMENTS/STIL.txt". -(My HVSC resides under "/usr/src/C64Music") +* Oversampling is available with SIDPlay2-emulation, it can further + enchange the audio quality, but requires even more power. +* Filter-settings can be usually left as they are, unless you know + what you're doing. -Notes -===== -* If the plugin doesn't recognize your sidtunes, try checking the - 'Determine filetype by contents' option in the xmms-sid config window. +* If the plugin doesn't recognize your SID-tunes, try checking the + 'Determine filetype by contents' option in the XMMS-SID config window. This is horrendously slow if you're reading a 10000-tune playlist, though. @@ -124,33 +55,24 @@ libsidplay. So if you think that the tune does not sound as it sounds on the real C64 (or other SID using machine), use the Mono setting. -* xmms-sid's configuration panel has been enchanged (from v0.6) - to have the libsidplay's SID filter configuration parameters. You - can tune them if you know what you're doing and maybe want to make - xmms-sid sound more like your own C64's SID (as some of you may - remember, the original SID 6580 had the infamous filter bug that - made every chip sound somewhat different!). If you don't know what - to do with these settings, just press the Reset Values button to - get the working defaults of libsidplay. - * The "kb/s rate" box is actually the play rate in Hz, so you can see if it's an NTSC or PAL song (if you haven't set the Force Speed option). -* Read file "README.songpos" for additional fun. +Also see FAQ for more tips, notes and such. + Contacting and where to get new versions ======================================== -New releases of this plugin should be available at TNSP's WWW -homepages, see below for address. Bug reports, suggestions, +New releases of this plugin should be available at TNSP's WWW- +homepages, see below for address. Bug-reports, suggestions, patches, etc. should be sent to ccr. -ccr's e-mail: mhamalai@ratol.fi +ccr's e-mail: ccr@tnsp.org - OR : ccr@iobox.com (if the one above does not work) +XMMS-SID's homepage: http://www.tnsp.org/xmms-sid.php TNSP's WWW : http://www.tnsp.org/ +TNSP e-mail : tnsp@tnsp.org -TNSP e-mail : tnsp@iobox.com - diff -r ff6b3a556a15 -r e5c49367b899 README.bugreport --- a/README.bugreport Tue Jun 03 11:19:04 2003 +0000 +++ b/README.bugreport Tue Jun 03 11:25:05 2003 +0000 @@ -2,8 +2,8 @@ ============================= Consider the following things before writing a bug-report. -1. Type of the bug: - +1. Type of the bug +------------------ - Sound-distortion? This may not be directly XMMS-SID bug, but more like SIDPlay bug. @@ -29,22 +29,22 @@ - Segfault? Again, check the tune on commandline SIDPlay. If it also segfaults, - report the bug to SIDPlay author, Michael Schwendt. + report the bug to SIDPlay author. If it does NOT segfault with commandline SIDPlay, report it to me (ccr). See README for contacting information. + - New feature? - Well, check on the commandl... ehh. :-) - - Send the suggestions, shit, hatemail, patches and your valuables to - ccr/TNSP, contacting information available on README. + Send the suggestions, shit, hatemail, patches, your valuables and + credit card numbers to ccr/TNSP, contacting information available + on README. ;-) 2. Example-layout for bug-reports - +--------------------------------- Here is an example layout for your bug-report. Feel free to use your own, or put in additional information. (Send it via e-mail, using subject: "XMMS-SID BUG") @@ -61,7 +61,7 @@ XMMS version : (xmms --version) -Are you using songpos-patch? (if you applied the patch, answer yes) +Are you using songpos-patch? Description of the bug? @@ -75,5 +75,5 @@ Other information ----------------- -[If the bug is/causes a segfault, include a backtrace if possible.] +[If the bug is/causes a segfault, include a gdb backtrace if possible.] diff -r ff6b3a556a15 -r e5c49367b899 TODO --- a/TODO Tue Jun 03 11:19:04 2003 +0000 +++ b/TODO Tue Jun 03 11:25:05 2003 +0000 @@ -1,45 +1,32 @@ -xmms-sid - SIDPlay input plugin for X MultiMedia System (XMMS) +XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS) ============================================================== -- [for v0.8 ?] - Some way to determine if a tune has stopped playing (yeah, right..) - Implementation suggestions: - * Use HVSC length database (from SIDPlay's homepage) - * For looping tunes, use configurable "max playing time" - * User should be able to turn length-detection off/on - * Maybe also somekind "silence treshold" detection scheme? - * Combination of all those methods above? + +- UPDATE LIBTOOL! done. + +- Support libSIDPlay v2.x if detected - Any of the above methods don't provide an 'exact' result due to - various reasons: + also make libsidplay1 optional, not required. + detect with configure. - a) It is fundamentally impossible to get the _RIGHT_ length - automatically, since you can't just wait for the "silent" part. - (Only 'real' way is to listen all the songs and determine the - time manually aka HVSC length db) + if (sidplay1 || 2) ok; else fail; - b) Some tunes are 'looping' in nature, so there is no "real - length". +--- -- Add alternative sub-song selection method, UADE-style pop-up. - -- Coloring to fileinfo window (to separate multiple - "artist"/"comment"/"name"/"title" fields) +----------------- +For XMMS-SID v0.9/1.0 -- [for v1.0 ?] - - * SIDPlay 2 support (when it gets mature enough) + * Possibly: Song "pre-rendering" support+position selector + work like it "should". Option for those who have the + CPU power (or patience) and enough RAM to spare for + the whole song. - * Possibly: Song "pre-rendering" support+position selector - work like it "should". Option for those who have the - CPU power (or patience) and enough RAM to spare for - the whole song. NOTE: This depends on the song-length - detection support! + * Make it more modular (for future enchangements) INTERNAL: -- Rewrite the callbacks/etc to work in "the Right Way of Glade" - so that editing the GUI would be easier. (probably not) +- Clean up the sources somewhat (char->gchar, etc) - Add STIL-database indexing for faster searches? (may not be real issue) + diff -r ff6b3a556a15 -r e5c49367b899 acsidplay.m4 --- a/acsidplay.m4 Tue Jun 03 11:19:04 2003 +0000 +++ b/acsidplay.m4 Tue Jun 03 11:25:05 2003 +0000 @@ -1,4 +1,10 @@ -# sidplay.m4 sidplay checks +# sidplay.m4 - libSIDPlay 1.xx.xx checks +# Originally by Michael Schwendt +# Modified by Matti 'ccr' Hamalainen + +dnl ------------------------------------------------------------------------- +dnl Try to find a file (or one of more files in a list of dirs). +dnl ------------------------------------------------------------------------- AC_DEFUN(AC_FIND_FILE, [ @@ -16,6 +22,10 @@ ] ) + +dnl ------------------------------------------------------------------------- +dnl Try to find SIDPLAY includes and library. +dnl ------------------------------------------------------------------------- AC_DEFUN(AC_PATH_LIBSIDPLAY, [ AC_MSG_CHECKING([for SIDPLAY includes and library]) @@ -46,7 +56,8 @@ ]) if test "$ac_sidplay_cflags" = NO || test "$ac_sidplay_library" = NO; then -#search common locations + +# Search common locations AC_CACHE_VAL(ac_cv_have_sidplay, [ @@ -99,8 +110,10 @@ all_includes="$SIDPLAY_CFLAGS $all_includes" fi -dnl Test compilation. +dnl *** +dnl *** Test compilation +dnl *** AC_MSG_CHECKING([whether -lsidplay works]) ac_cxxflags_safe=$CXXFLAGS ac_ldflags_safe=$LDFLAGS @@ -129,7 +142,10 @@ have_sidplay=no fi -dnl + +dnl *** +dnl *** Substitute variables +dnl *** AC_SUBST(SIDPLAY_CFLAGS) AC_SUBST(SIDPLAY_LIBS) diff -r ff6b3a556a15 -r e5c49367b899 autogen.sh --- a/autogen.sh Tue Jun 03 11:19:04 2003 +0000 +++ b/autogen.sh Tue Jun 03 11:25:05 2003 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh echo "**************************************************" echo "** Generating build information **" @@ -9,7 +9,7 @@ # Touch the timestamps on all the files since CVS messes them up directory=`dirname $0` -touch $directory/configure.in +touch $directory/configure.ac # Regenerate configuration files echo "* aclocal" diff -r ff6b3a556a15 -r e5c49367b899 src/Makefile.am --- a/src/Makefile.am Tue Jun 03 11:19:04 2003 +0000 +++ b/src/Makefile.am Tue Jun 03 11:25:05 2003 +0000 @@ -10,9 +10,9 @@ # Plugin sources libxmmssid_la_SOURCES = \ - xmms-sid.cc xmms-sid.h \ + xmms-sid.cpp xmms-sid.h \ xs_init.c \ - xs_title.cc \ + xs_title.cpp \ xs_support.c xs_support.h \ xs_config.c xs_config.h \ xs_md5.c xs_md5.h \ diff -r ff6b3a556a15 -r e5c49367b899 xmms-sid.glade --- a/xmms-sid.glade Tue Jun 03 11:19:04 2003 +0000 +++ b/xmms-sid.glade Tue Jun 03 11:25:05 2003 +0000 @@ -2,20 +2,28 @@ - paske - paske + xmms-sid + xmms-sid src pixmaps C False False + True + False + xs_interface.c + xs_interface.h + xs_genui.c + xs_genui.h + xs_glade.c + xs_glade.h GtkWindow - sid_configwin - xmms-sid configuration + xs_configwin + XMMS-SID configuration GTK_WINDOW_DIALOG GTK_WIN_POS_NONE False @@ -35,7 +43,7 @@ cfg_notebook True True - True + False GTK_POS_TOP False 2 @@ -80,19 +88,21 @@ GtkVBox vbox9 + 2 False 0 GtkRadioButton cfg_res_8bit + 2 True False True resolution - 0 + 2 False False @@ -101,13 +111,14 @@ GtkRadioButton cfg_res_16bit + 2 True False True resolution - 0 + 2 False False @@ -131,19 +142,21 @@ GtkVBox vbox10 + 2 False 0 GtkRadioButton cfg_chn_mono + 2 True False True channels - 0 + 2 False False @@ -152,13 +165,14 @@ GtkRadioButton cfg_chn_stereo + 2 True False True channels - 0 + 2 False False @@ -167,13 +181,14 @@ GtkRadioButton cfg_chn_autopan + 2 True False True channels - 0 + 2 False False @@ -206,6 +221,7 @@ GtkHBox hbox4 + 4 False 0 @@ -213,11 +229,6 @@ GtkSpinButton cfg_samplerate True - - changed - on_cfg_samplerate_changed - Mon, 18 Sep 2000 17:52:20 GMT - 1 0 False @@ -258,22 +269,110 @@ - GtkCheckButton - cfg_checkfilecontent - True - - toggled - on_cfg_checkfilecontent_toggled - Mon, 18 Sep 2000 17:51:55 GMT - - - False - True + GtkFrame + frame27 + 4 + + 0 + GTK_SHADOW_ETCHED_IN 0 - False - False + True + True + + + GtkVBox + vbox27 + False + 0 + + + GtkCheckButton + cfg_oversample + 4 + True + + False + True + + 0 + False + False + + + + + GtkHBox + hbox16 + 4 + False + 4 + + 0 + False + True + + + + GtkLabel + label42 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkSpinButton + cfg_oversample_factor + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 + 2 + 8 + 1 + 1 + 1 + + 0 + False + True + + + + + GtkLabel + label43 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + @@ -297,6 +396,74 @@ 0 + GtkFrame + frame26 + 4 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkVBox + vbox26 + 2 + False + 0 + + + GtkRadioButton + cfg_emu_sidplay1 + Use libSIDPlay 1.x emulation, faster but not so accurate. Good in most cases, though. + True + + False + True + emulator + + 0 + False + False + + + + + GtkRadioButton + cfg_emu_sidplay2 + Use libSIDPlay 2.x emulation, which requires powerful CPU due to more exact emulation. + True + + False + True + emulator + + 0 + False + False + + + + + GtkCheckButton + cfg_emu_sidplay2_opt + True + + False + True + + 0 + False + False + + + + + + GtkHBox hbox1 False @@ -323,19 +490,20 @@ GtkVBox vbox4 + 2 False 0 GtkRadioButton - cfg_clock_pal + cfg_emu_clock_pal True - + False True speed - 0 + 2 False False @@ -343,14 +511,14 @@ GtkRadioButton - cfg_clock_ntsc + cfg_emu_clock_ntsc True - + False True speed - 0 + 2 False False @@ -358,18 +526,13 @@ GtkCheckButton - cfg_clock_force + cfg_emu_clock_force True - - toggled - on_cfg_clock_force_toggled - Mon, 18 Sep 2000 17:51:45 GMT - False True - 0 + 2 False False @@ -381,7 +544,7 @@ GtkFrame frame3 4 - + 0 GTK_SHADOW_ETCHED_IN @@ -393,19 +556,20 @@ GtkVBox vbox3 + 2 False 0 GtkRadioButton - cfg_wav_mos6581 + cfg_emu_mos6581 True False True waveforms - 0 + 2 False False @@ -413,33 +577,14 @@ GtkRadioButton - cfg_wav_mos8580 + cfg_emu_mos8580 True False True waveforms - 0 - False - False - - - - - GtkCheckButton - cfg_emufilters - True - - toggled - on_cfg_emufilters_toggled - Mon, 18 Sep 2000 17:51:41 GMT - - - False - True - - 0 + 2 False False @@ -464,19 +609,20 @@ GtkVBox vbox5 + 2 False 0 GtkRadioButton - cfg_mem_banksw + cfg_emu_mem_banksw True False True memorymode - 0 + 2 False False @@ -484,14 +630,14 @@ GtkRadioButton - cfg_mem_transrom + cfg_emu_mem_transrom True False True memorymode - 0 + 2 False False @@ -499,14 +645,14 @@ GtkRadioButton - cfg_mem_playsid + cfg_emu_mem_playsid True False True memorymode - 0 + 2 False False @@ -529,16 +675,327 @@ + GtkFrame + frame17 + 4 + + 0 + GTK_SHADOW_ETCHED_IN + + + GtkVBox + vbox25 + False + 0 + + + GtkCheckButton + cfg_emu_filters + 4 + True + + False + True + + 0 + False + False + + + + + GtkHBox + hbox8 + 4 + False + 0 + + 0 + True + True + + + + GtkFrame + cfg_frm1 + 2 + 56 + 152 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkVScale + cfg_emu_filt_fs + True + True + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + 0 + 0 + 1000 + 1 + 100 + 0 + + + + + GtkFrame + cfg_frm2 + 2 + 48 + 152 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkVScale + cfg_emu_filt_fm + True + True + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + 0 + 0 + 100 + 1 + 10 + 0 + + + + + GtkFrame + frame12 + 2 + 48 + 152 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkVScale + cfg_emu_filt_ft + True + True + GTK_POS_TOP + 2 + GTK_UPDATE_CONTINUOUS + 0 + 0 + 1 + 0.01 + 0.1 + 0 + + + + + GtkVBox + vbox17 + 4 + False + 0 + + 0 + True + True + + + + GtkButton + cfg_filt_reset + 120 + 32 + True + + clicked + cfg_filt_reset_clicked + Mon, 18 Sep 2000 20:21:27 GMT + + + GTK_RELIEF_NORMAL + + 0 + False + False + + + + + GtkLabel + label9 + 136 + 104 + + GTK_JUSTIFY_LEFT + True + 0.5 + 7.45058e-09 + 0 + 0 + + 0 + False + False + + + + + + + + + GtkLabel + Notebook:tab + label24 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + GtkVBox - vbox7 + vbox20 False 0 GtkFrame - frame7 + frame21 4 - + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkVBox + vbox21 + 2 + False + 0 + + + GtkCheckButton + cfg_sld_usemaxtime + True + + False + True + + 2 + False + False + + + + + GtkHBox + hbox14 + False + 0 + + 2 + True + True + + + + GtkLabel + label37 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkSpinButton + cfg_sld_maxtime + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 60 + 1 + 32767 + 1 + 60 + 60 + + 0 + False + True + + + + + GtkLabel + label36 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + False + False + + + + + + + + GtkFrame + frame18 + 4 + 0 GTK_SHADOW_ETCHED_IN @@ -549,19 +1006,385 @@ GtkVBox + vbox18 + 2 + False + 0 + + + GtkRadioButton + cfg_sld_none + 2 + No automatic song-length detection. (See also Maximum playtime check) + True + + True + True + songlength + + 2 + False + False + + + + + GtkHSeparator + hseparator1 + + 2 + True + True + + + + + GtkRadioButton + cfg_sld_maxsilence + 2 + Detect possible end of song with silence timing. + True + + False + True + songlength + + 2 + False + False + + + + + GtkTable + table3 + 2 + 2 + 3 + False + 4 + 4 + + 2 + True + True + + + + GtkLabel + label29 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label30 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + cfg_sld_percentage + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label31 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label32 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + cfg_sld_percentage + + 2 + 3 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkSpinButton + cfg_sld_silencetime + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 30 + 0 + 180 + 1 + 15 + 15 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkSpinButton + cfg_sld_percentage + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 + 0 + 100 + 1 + 10 + 10 + + 1 + 2 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + + GtkHSeparator + hseparator3 + + 2 + True + True + + + + + GtkRadioButton + cfg_sld_database + 2 + This option enables using of XSIDPLAY compatible HVSC Song-length database. (See documentation for more information) + True + + False + True + songlength + + 2 + False + False + + + + + GtkHBox + hbox13 + 2 + False + 4 + + 0 + True + True + + + + GtkLabel + label33 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + True + + + + + GtkEntry + cfg_sld_dbpath + Database path and filename + True + True + True + 0 + + + 0 + True + True + + + + + GtkButton + cfg_sld_dbbrowse + Browse for database-file + True + + clicked + cfg_sld_dbbrowse_clicked + Sat, 18 Aug 2001 23:38:10 GMT + + + GTK_RELIEF_NORMAL + + 0 + False + False + + + + + + + + + GtkLabel + Notebook:tab + label26 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkVBox + vbox19 + False + 0 + + + GtkFrame + frame7 + 4 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + False + True + + + + GtkVBox vbox8 - False + 4 + True 0 GtkCheckButton cfg_stil_use + 2 True False True - 0 + 2 True False @@ -615,7 +1438,7 @@ True True 0 - homoa + /home/C64Music/DOCUMENTS/STIL.txt @@ -640,7 +1463,7 @@ True clicked - on_cfg_stil_browse_clicked + cfg_stil_browse_clicked Mon, 18 Sep 2000 17:51:32 GMT @@ -653,63 +1476,50 @@ GtkFrame - frame9 + frame22 4 - + 0 GTK_SHADOW_ETCHED_IN 0 - True + False True GtkVBox - vbox11 + vbox22 False 0 - GtkAlignment - alignment3 - 0.5 - 0.5 - 0.96 - 1 + GtkCheckButton + cfg_finfo_usecolor + 2 + True + + False + True 0 False False - - - GtkEntry - cfg_songnameformat - True - True - True - 0 - - - GtkLabel - label7 - - GTK_JUSTIFY_LEFT - False - 0.04 - 0.5 - 0 - 0 + GtkCheckButton + cfg_detectmagic + 2 + True + + False + True 0 - True - True + False + False @@ -720,7 +1530,7 @@ GtkLabel Notebook:tab label3 - + GTK_JUSTIFY_CENTER False 0.5 @@ -730,125 +1540,118 @@ - GtkFixed - fixed1 - Reset filter to default values - - - GtkButton - cfg_filt_reset - 224 - 16 - 120 - 32 - True - - clicked - on_cfg_filt_reset_clicked - Mon, 18 Sep 2000 20:21:27 GMT - - - GTK_RELIEF_NORMAL - + GtkFrame + frame16 + 4 + + 0 + GTK_SHADOW_ETCHED_IN - GtkLabel - label9 - 224 - 56 - 136 - 104 - - GTK_JUSTIFY_LEFT - True - 0.5 - 7.45058e-09 - 0 - 0 - + GtkVBox + vbox16 + 4 + False + 0 - - GtkFrame - frame12 - 160 - 16 - 48 - 152 - - 0 - GTK_SHADOW_ETCHED_IN + + GtkCheckButton + cfg_ftitle_override + True + + False + True + + 2 + False + False + + + + + GtkEntry + cfg_ftitle_format + True + True + True + 0 + %1 : %2 (C) %3 [%5 %6 by %8] -- %9 + + 2 + False + False + + - GtkVScale - cfg_filt_ft - True - True - GTK_POS_TOP - 2 - GTK_UPDATE_CONTINUOUS - 0 - 0 - 1 - 0.01 - 0.1 - 0 + GtkHBox + hbox9 + True + 0 + + 2 + False + False + + + + GtkLabel + label7 + + GTK_JUSTIFY_LEFT + False + 0.04 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkLabel + label25 + + GTK_JUSTIFY_LEFT + False + 0.04 + 0.5 + 0 + 0 + + 0 + False + False + + - - - - GtkFrame - cfg_frm2 - 88 - 16 - 48 - 152 - - 0 - GTK_SHADOW_ETCHED_IN - GtkVScale - cfg_filt_fm - True - True - GTK_POS_TOP - 1 - GTK_UPDATE_CONTINUOUS - 0 - 0 - 100 - 1 - 10 - 0 - - - - - GtkFrame - cfg_frm1 - 16 - 16 - 56 - 152 - - 0 - GTK_SHADOW_ETCHED_IN - - - GtkVScale - cfg_filt_fs - True - True - GTK_POS_TOP - 1 - GTK_UPDATE_CONTINUOUS - 0 - 0 - 1000 - 1 - 100 - 0 + GtkLabel + label34 + + GTK_JUSTIFY_FILL + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + @@ -856,8 +1659,8 @@ GtkLabel Notebook:tab - label6 - + label23 + GTK_JUSTIFY_CENTER False 0.5 @@ -891,7 +1694,7 @@ True clicked - on_cfg_ok_clicked + cfg_ok_clicked Mon, 18 Sep 2000 17:49:51 GMT @@ -906,7 +1709,7 @@ True clicked - on_cfg_cancel_clicked + cfg_cancel_clicked Mon, 18 Sep 2000 17:49:57 GMT @@ -918,26 +1721,54 @@ GtkWindow - sid_aboutwin - About xmms-sid + xs_aboutwin + About XMMS-SID GTK_WINDOW_DIALOG GTK_WIN_POS_NONE - False + True + 300 False - False + True False GtkVBox - vbox12 + about_vbox1 False 0 - GtkHBox - hbox5 - False - 0 + GtkFrame + about_frame + 4 + 0 + GTK_SHADOW_OUT + + 0 + False + False + + + + GtkPixmap + about_pixmap + xmms-sid-logo.xpm + 0.5 + 0.5 + 0 + 6 + True + + + + + GtkScrolledWindow + about_scrwin + 8 + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS 0 True @@ -945,76 +1776,67 @@ - GtkFrame - frame13 - 4 - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - + GtkText + about_text + 100 + True + True + Programming and design + Matti 'ccr/TNSP' Hämäläinen + +libSIDPlay created by + Michael Schwendt + +Original programming and design + Willem Monsuwe - - GtkPixmap - pixmap1 - xmms-sid-logo.xpm - 0.5 - 0.5 - 4 - 4 - True - - +"XMMS-SID Theme"-song (SIDtune) + Peter 'Brite-Lite' Halin of Dekadence + (C) Copyright 2002 Dekadence + http://www.dekadence64.org/ + +Thanks and greetings ... + JaMZ, MdX, fgcl, Sindrom, + Ssadistik, Delfine, Viznut, at, + Feenix, juhas, Loop, Nrg, ytti ... - - GtkLabel - label10 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 8 - 0 - - 0 - False - False - + PwP, iSO, Byterapers, Fairlight, + mfx, Unique, Static, Dekadence, + Mass, PHn, tAAt ... + +Special thanks + - All the betatesters. + - All the users! Hey it's you! + - And others ... + - GtkHButtonBox - hbuttonbox2 - GTK_BUTTONBOX_DEFAULT_STYLE - 30 - 85 - 27 - 7 - 0 + GtkAlignment + alignment6 + 8 + 0.5 + 0.5 + 0.18 + 1 0 - True + False True GtkButton - about_ok + about_close True True clicked - on_about_ok_clicked + about_ok_clicked Tue, 19 Sep 2000 19:57:12 GMT - + GTK_RELIEF_NORMAL @@ -1023,10 +1845,10 @@ GtkWindow - sid_fileinfowin + xs_fileinfowin 400 350 - xmms-sid fileinfo + XMMS-SID fileinfo GTK_WINDOW_DIALOG GTK_WIN_POS_MOUSE False @@ -1319,7 +2141,7 @@ True clicked - on_fileinfo_sub_tune_clicked + fileinfo_sub_tune_clicked Mon, 06 Nov 2000 23:36:32 GMT Main tune @@ -1341,11 +2163,11 @@ GtkTable table2 4 - 2 + 3 2 False - 0 - 0 + 2 + 4 0 False @@ -1451,6 +2273,56 @@ False + + + GtkLabel + label41 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkEntry + fileinfo_sub_length + True + False + True + 0 + + + 1 + 2 + 2 + 3 + 0 + 0 + True + False + False + False + True + False + + @@ -1497,9 +2369,10 @@ True True True + True clicked - on_fileinfo_ok_clicked + fileinfo_ok_clicked Mon, 06 Nov 2000 23:04:15 GMT @@ -1510,10 +2383,166 @@ + GtkWindow + xs_songcontrolwin + XMMS-SID + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + False + False + + + GtkFrame + frame25 + 2 + 0 + GTK_SHADOW_OUT + + + GtkVBox + vbox24 + 4 + True + 0 + + + GtkHBox + hbox15 + False + 4 + + 0 + True + True + + + + GtkButton + ctrl_song_prev + True + + clicked + ctrl_song_prev + Tue, 23 Apr 2002 21:25:08 GMT + + + GTK_RELIEF_NORMAL + + 0 + False + False + + + + + GtkHScale + ctrl_song_current + True + True + GTK_POS_TOP + 0 + GTK_UPDATE_CONTINUOUS + 1 + 1 + 6 + 0 + 0 + 0 + + 0 + True + True + + + + + GtkButton + ctrl_song_next + True + + clicked + ctrl_song_next + Tue, 23 Apr 2002 21:25:28 GMT + + + GTK_RELIEF_NORMAL + + 0 + False + False + + + + + + GtkEntry + ctrl_song_name + True + False + True + 0 + paski + + 0 + True + True + + + + + + + GtkFileSelection - fileselection1 + xs_dbfileselector 10 - Select STIL DataBase File + Select HVSC song-length database + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + True + False + True + False + True + + + GtkButton + FileSel:ok_button + ok_button2 + True + True + + clicked + songlensel_ok_button_clicked + Sat, 19 Oct 2002 22:50:48 GMT + + + GTK_RELIEF_NORMAL + + + + GtkButton + FileSel:cancel_button + cancel_button2 + True + True + + clicked + songlensel_cancel_button_clicked + Sat, 19 Oct 2002 22:50:54 GMT + + + GTK_RELIEF_NORMAL + + + + + GtkFileSelection + xs_stilfileselector + 10 + Select STIL-database GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -1525,20 +2554,30 @@ GtkButton FileSel:ok_button - ok_button1 + ok_button3 True True - GNOME_STOCK_BUTTON_OK + + clicked + stilsel_ok_button_clicked + Sat, 19 Oct 2002 22:50:38 GMT + + GTK_RELIEF_NORMAL GtkButton FileSel:cancel_button - cancel_button1 + cancel_button3 True True - GNOME_STOCK_BUTTON_CANCEL + + clicked + stilsel_cancel_button_clicked + Sat, 19 Oct 2002 22:51:00 GMT + + GTK_RELIEF_NORMAL