mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-08-13 03:24:45 +02:00
Update to v099r16 release (public beta).
byuu says: Changelog: - hiro: BrowserDialog can navigate up to drive selection on Windows - nall: (file,path,dir,base,prefix,suffix)name => Location::(file,path,dir,base,prefix,suffix) - higan/tomoko: rename audio filter label from "Sinc" to "IIR - Biquad" - higan/tomoko: allow loading files via icarus on the command-line once again - higan/tomoko: (begrudging) quick hack to fix presentation window focus on startup - higan/audio: don't divide output audio volume by number of streams - processor/r65816: fix a regression in (read,write)DB; fixes Taz-Mania - fixed compilation regressions on Windows and Linux I'm happy with where we are at with code cleanups and stability, so I'd like to release v100. But even though I'm not assigning any special significance to this version, we should probably test it more thoroughly first.
This commit is contained in:
@@ -4,6 +4,8 @@
|
||||
* revision 0.03
|
||||
*/
|
||||
|
||||
#include <nall/location.hpp>
|
||||
|
||||
namespace nall { namespace {
|
||||
|
||||
struct DML {
|
||||
@@ -45,7 +47,7 @@ auto DML::parse(const string& filedata, const string& pathname) -> string {
|
||||
}
|
||||
|
||||
auto DML::parse(const string& filename) -> string {
|
||||
if(!settings.path) settings.path = pathname(filename);
|
||||
if(!settings.path) settings.path = Location::path(filename);
|
||||
string document = settings.reader ? settings.reader(filename) : string::read(filename);
|
||||
parseDocument(document, settings.path, 0);
|
||||
return state.output;
|
||||
@@ -68,7 +70,7 @@ auto DML::parseBlock(string& block, const string& pathname, uint depth) -> bool
|
||||
if(block.beginsWith("<include ") && block.endsWith(">")) {
|
||||
string filename{pathname, block.trim("<include ", ">", 1L).strip()};
|
||||
string document = settings.reader ? settings.reader(filename) : string::read(filename);
|
||||
parseDocument(document, nall::pathname(filename), depth + 1);
|
||||
parseDocument(document, Location::path(filename), depth + 1);
|
||||
}
|
||||
|
||||
//html
|
||||
|
Reference in New Issue
Block a user