mirror of https://github.com/ZDoom/gzdoom.git
parent
9ab6ac39a0
commit
f96dd8ff8a
|
@ -18,8 +18,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
|
||||||
|
|
||||||
#include "blargg_source.h"
|
#include "blargg_source.h"
|
||||||
|
|
||||||
Gbs_Emu::equalizer_t const Gbs_Emu::handheld_eq = { -47.0, 2000 };
|
Gbs_Emu::equalizer_t const Gbs_Emu::handheld_eq = { -47.0, 2000, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||||
Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq = { 0.0, 300 };
|
Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq = { 0.0, 300, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||||
|
|
||||||
Gbs_Emu::Gbs_Emu()
|
Gbs_Emu::Gbs_Emu()
|
||||||
{
|
{
|
||||||
|
@ -39,7 +39,7 @@ Gbs_Emu::Gbs_Emu()
|
||||||
set_max_initial_silence( 21 );
|
set_max_initial_silence( 21 );
|
||||||
set_gain( 1.2 );
|
set_gain( 1.2 );
|
||||||
|
|
||||||
static equalizer_t const eq = { -1.0, 120 };
|
static equalizer_t const eq = { -1.0, 120, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||||
set_equalizer( eq );
|
set_equalizer( eq );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ int const silence_threshold = 0x10;
|
||||||
long const fade_block_size = 512;
|
long const fade_block_size = 512;
|
||||||
int const fade_shift = 8; // fade ends with gain at 1.0 / (1 << fade_shift)
|
int const fade_shift = 8; // fade ends with gain at 1.0 / (1 << fade_shift)
|
||||||
|
|
||||||
Music_Emu::equalizer_t const Music_Emu::tv_eq = { -8.0, 180 };
|
Music_Emu::equalizer_t const Music_Emu::tv_eq = { -8.0, 180, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||||
|
|
||||||
void Music_Emu::clear_track_vars()
|
void Music_Emu::clear_track_vars()
|
||||||
{
|
{
|
||||||
|
|
|
@ -31,8 +31,8 @@ int const fme7_flag = 0x20;
|
||||||
|
|
||||||
long const clock_divisor = 12;
|
long const clock_divisor = 12;
|
||||||
|
|
||||||
Nsf_Emu::equalizer_t const Nsf_Emu::nes_eq = { -1.0, 80 };
|
Nsf_Emu::equalizer_t const Nsf_Emu::nes_eq = { -1.0, 80, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||||
Nsf_Emu::equalizer_t const Nsf_Emu::famicom_eq = { -15.0, 80 };
|
Nsf_Emu::equalizer_t const Nsf_Emu::famicom_eq = { -15.0, 80, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||||
|
|
||||||
int Nsf_Emu::pcm_read( void* emu, nes_addr_t addr )
|
int Nsf_Emu::pcm_read( void* emu, nes_addr_t addr )
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,7 +36,7 @@ Vgm_Emu::Vgm_Emu()
|
||||||
|
|
||||||
set_silence_lookahead( 1 ); // tracks should already be trimmed
|
set_silence_lookahead( 1 ); // tracks should already be trimmed
|
||||||
|
|
||||||
static equalizer_t const eq = { -14.0, 80 };
|
static equalizer_t const eq = { -14.0, 80, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||||
set_equalizer( eq );
|
set_equalizer( eq );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -337,7 +337,7 @@ void GMEAPI gme_set_equalizer ( Music_Emu* me, gme_equalizer_t const* eq )
|
||||||
|
|
||||||
void GMEAPI gme_equalizer( Music_Emu const* me, gme_equalizer_t* out )
|
void GMEAPI gme_equalizer( Music_Emu const* me, gme_equalizer_t* out )
|
||||||
{
|
{
|
||||||
gme_equalizer_t e = { };
|
gme_equalizer_t e = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||||
e.treble = me->equalizer().treble;
|
e.treble = me->equalizer().treble;
|
||||||
e.bass = me->equalizer().bass;
|
e.bass = me->equalizer().bass;
|
||||||
*out = e;
|
*out = e;
|
||||||
|
|
|
@ -55,6 +55,7 @@ DArgs::DArgs()
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
||||||
DArgs::DArgs(const DArgs &other)
|
DArgs::DArgs(const DArgs &other)
|
||||||
|
: DObject()
|
||||||
{
|
{
|
||||||
Argv = other.Argv;
|
Argv = other.Argv;
|
||||||
}
|
}
|
||||||
|
|
|
@ -417,7 +417,7 @@ void FNodeBuilder::FindPolyContainers (TArray<FPolyStart> &spots, TArray<FPolySt
|
||||||
// Scan right for the seg closest to the polyobject's center after it
|
// Scan right for the seg closest to the polyobject's center after it
|
||||||
// gets moved to its start spot.
|
// gets moved to its start spot.
|
||||||
fixed_t closestdist = FIXED_MAX;
|
fixed_t closestdist = FIXED_MAX;
|
||||||
DWORD closestseg = 0;
|
unsigned int closestseg = UINT_MAX;
|
||||||
|
|
||||||
P(Printf ("start %d,%d -- center %d, %d\n", spot->x>>16, spot->y>>16, center.x>>16, center.y>>16));
|
P(Printf ("start %d,%d -- center %d, %d\n", spot->x>>16, spot->y>>16, center.x>>16, center.y>>16));
|
||||||
|
|
||||||
|
@ -452,7 +452,7 @@ void FNodeBuilder::FindPolyContainers (TArray<FPolyStart> &spots, TArray<FPolySt
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (closestseg >= 0)
|
if (closestseg != UINT_MAX)
|
||||||
{
|
{
|
||||||
loop = MarkLoop (closestseg, loop);
|
loop = MarkLoop (closestseg, loop);
|
||||||
P(Printf ("Found polyobj in sector %d (loop %d)\n", Segs[closestseg].frontsector,
|
P(Printf ("Found polyobj in sector %d (loop %d)\n", Segs[closestseg].frontsector,
|
||||||
|
|
|
@ -364,6 +364,7 @@ AActor::AActor () throw()
|
||||||
}
|
}
|
||||||
|
|
||||||
AActor::AActor (const AActor &other) throw()
|
AActor::AActor (const AActor &other) throw()
|
||||||
|
: DThinker()
|
||||||
{
|
{
|
||||||
memcpy (&x, &other.x, (BYTE *)&this[1] - (BYTE *)&x);
|
memcpy (&x, &other.x, (BYTE *)&this[1] - (BYTE *)&x);
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ public:
|
||||||
FTempFileName (const char *prefix=NULL);
|
FTempFileName (const char *prefix=NULL);
|
||||||
~FTempFileName ();
|
~FTempFileName ();
|
||||||
|
|
||||||
operator const char * const () { return Name; }
|
operator const char * () { return Name; }
|
||||||
const char * GetName () const { return Name; }
|
const char * GetName () const { return Name; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -1212,6 +1212,7 @@ FWadLump::FWadLump ()
|
||||||
}
|
}
|
||||||
|
|
||||||
FWadLump::FWadLump (const FWadLump ©)
|
FWadLump::FWadLump (const FWadLump ©)
|
||||||
|
: FileReader()
|
||||||
{
|
{
|
||||||
// This must be defined isn't called.
|
// This must be defined isn't called.
|
||||||
File = copy.File;
|
File = copy.File;
|
||||||
|
|
Loading…
Reference in New Issue