# HG changeset patch # User nenolod # Date 1150331922 25200 # Node ID c18d0da08face2d2b42111ce94e44d945a1569d8 # Parent b8f5cb287ed278116f089e3ffdb0c4b1240b426b [svn] - allow FDS files to play (although samples are presently ignored) diff -r b8f5cb287ed2 -r c18d0da08fac ChangeLog --- a/ChangeLog Wed Jun 14 17:32:38 2006 -0700 +++ b/ChangeLog Wed Jun 14 17:38:42 2006 -0700 @@ -1,3 +1,12 @@ +2006-06-15 00:32:38 +0000 George Averill + revision [1364] + - Use the correct beepctrl.h. + + + Changes: Modified: + +1 -1 trunk/audtool/audtool.c + + 2006-06-15 00:21:25 +0000 George Averill revision [1362] - Make the category_view slightly wider to get rid of the horizontal scrollbar caused by the word "Connectivity" being so damned big. diff -r b8f5cb287ed2 -r c18d0da08fac Plugins/Input/console/Nsf_Emu.cpp --- a/Plugins/Input/console/Nsf_Emu.cpp Wed Jun 14 17:32:38 2006 -0700 +++ b/Plugins/Input/console/Nsf_Emu.cpp Wed Jun 14 17:38:42 2006 -0700 @@ -44,6 +44,7 @@ const int master_clock_divisor = 12; const int vrc6_flag = 0x01; +const int fds_flag = 0x04; const int namco_flag = 0x10; const int fme7_flag = 0x20; @@ -271,7 +272,7 @@ blargg_err_t Nsf_Emu::init_sound() { - if ( exp_flags & ~(namco_flag | vrc6_flag | fme7_flag) ) + if ( exp_flags & ~(namco_flag | vrc6_flag | fme7_flag | fds_flag) ) return "NSF requires unsupported expansion audio hardware"; // map memory @@ -386,6 +387,7 @@ // sound and memory exp_flags = header_.chip_flags; + printf("%x\n", header_.chip_flags); blargg_err_t err = init_sound(); if ( err ) return err;