head 1.2; access; symbols pkgsrc-2018Q3:1.1.0.60 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.58 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.56 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.54 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.52 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.48 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.46 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.44 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.42 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.40 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.38 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.36 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.34 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.32 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.30 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.28 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.26 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.24 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.22 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.20 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.18 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.16 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.14 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.12 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.10 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.8 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.6 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.4 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.2 pkgsrc-2011Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2018.12.11.09.50.44; author wiz; state dead; branches; next 1.1; commitid 5O36TuXofh5yFm3B; 1.1 date 2011.09.03.23.40.47; author dholland; state Exp; branches; next ; desc @@ 1.2 log @adplug: update to 2.3.1. Changes for version 2.3.1: -------------------------- - Fixed unconditional inclusion of "sys/io.h" on Linux - Autotools improvement - Non-recursive Automake, improved parallelizability - Compatibility fixes for FreeBSD's pmake and OpenBSD's make - Out-of-source building Changes for version 2.3: ------------------------- - Bug fixes: - CMF: Fix uninitialised variable use (thanks binarymaster) - CMF: Handle invalid offsets without crashing - ROL: Prevent access beyond end of vector - MSC: Fix use of uninitialised variable - HSC: Handle out of range patterns more gracefully - MID: Fix for issue #2 - out of range array read - LDS: Use the tempo stored inside the Loudness-File instead of simply returning 70Hz - RIX: Fix several replay bugs (thanks to Palxex) - RIX: Big-endian fix by Wei Mingzhi - XAD: Tempo fix - Various other out of bounds array fixes, timing fixes, etc. - New formats: - BMF: Easy AdLib 1.0 - CMF: SoundFX Macs Opera - GOT: God of Thunder - HSQ/SQX/SDB/AGD/HA2: Herbulot AdLib System (HERAD) - MUS/IMS/MDI: AdLib Visual Composer ROL derivatives - SOP: sopepos' Note Player - VGM: Video Game Music - Allow compilation on platforms that don't support real OPL hardware access - Add support for compiling on Appveyor and publishing a NuGet package - Add Visual Studio 2015 projects - Add support for Travis CI builds - Add new CRC16 and CRC32 tests - Addition of WoodyOPL from DOSBox SVN (thanks to NY00123) - Addition of NukedOPL (thanks to loki666 and nukeykt) - Move from SourceForge to GitHub - DRO player refactored (thanks to Laurence Myers and William Yates) - Add (mono) OPL3 support to the surround/harmonic-effect OPL - Fix occasional random noise in right channel when using surround OPL and Satoh synth - Add display for ROL comment and instrument names - Improve support for different Westwood ADL format versions - Improve CMF transpose support (per-channel now) - Autotools build environment updated Changes for version 2.2.1: -------------------------- - Bug fixes: - CMF: Fix crash on v1.0 files - DRO: Correct playback of early v0.1 files Changes for version 2.2: ------------------------ - New format support: - JBM: JBM Adlib Music Format - CMF: New player (more accurate) for Creative Music Format - DRO: DOSBox Raw OPL v2.0 support - Fixed current subsong rewind in D00 player. - Added test case for ADL file format. - Fixed replay bug in DRO player (thanks to Adam Nielsen). - New surround/harmonic synth effect (sounds really nice!) @ text @$NetBSD: patch-adplugdb_adplugdb_cpp,v 1.1 2011/09/03 23:40:47 dholland Exp $ const correctness, required by clang --- adplugdb/adplugdb.cpp.orig 2006-05-17 12:47:21.000000000 +0000 +++ adplugdb/adplugdb.cpp @@@@ -99,13 +99,15 @@@@ static const struct { }; static struct { - char *db_file; + const char *db_file; + char *freeable_db_file; CAdPlugDatabase::CRecord::RecordType rtype; int message_level; bool usedefaultdb, usercomment, cmdkeys; const char *homedir; } cfg = { ADPLUGDB_PATH, + NULL, CAdPlugDatabase::CRecord::Plain, MSG_NOTE, false, false, false, @@@@ -297,7 +299,7 @@@@ static void db_save(void) static void shutdown(void) { // Free userdb variable, if applicable - if(cfg.homedir && !cfg.usedefaultdb) free(cfg.db_file); + if(cfg.homedir && !cfg.usedefaultdb) free(cfg.freeable_db_file); } /***** Main program *****/ @@@@ -355,11 +357,14 @@@@ int main(int argc, char *argv[]) // Try user's home directory first, before trying the default location. cfg.homedir = getenv("HOME"); if(cfg.homedir && !cfg.usedefaultdb) { - cfg.db_file = (char *)malloc(strlen(cfg.homedir) + strlen(ADPLUG_CONFDIR) + + char *s; + s = (char *)malloc(strlen(cfg.homedir) + strlen(ADPLUG_CONFDIR) + strlen(ADPLUGDB_FILE) + 3); - strcpy(cfg.db_file, cfg.homedir); - strcat(cfg.db_file, "/" ADPLUG_CONFDIR "/"); - strcat(cfg.db_file, ADPLUGDB_FILE); + strcpy(s, cfg.homedir); + strcat(s, "/" ADPLUG_CONFDIR "/"); + strcat(s, ADPLUGDB_FILE); + cfg.freeable_db_file = s; + cfg.db_file = s; } // Load database file @ 1.1 log @const correctness, required by clang @ text @d1 1 a1 1 $NetBSD$ @