Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "added per-sound channel individual volume core options (#166)" #175

Merged
merged 1 commit into from
Dec 24, 2020
+4 −117
Merged

Revert "added per-sound channel individual volume core options (#166)" #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions libgambatte/include/gambatte.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "serial_io.h"
#endif
#include "gbint.h"
#include "sound.h"
#include <string>
#include <cstddef>

Expand Down Expand Up @@ -141,7 +140,6 @@ class GB {
void *rombank1_ptr() const;
void *zeropage_ptr() const;
void *oamram_ptr() const;
PSG *getPSG() const;
#endif

private:
Expand Down
11 changes: 0 additions & 11 deletions libgambatte/libretro/libretro.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,17 +1144,6 @@ static void check_variables(void)

/* Interframe blending option has its own handler */
check_frame_blend_variable();

char sound_channel_volume_base_str[] = "gambatte_channel_1_volume";
var.key = sound_channel_volume_base_str;
for (unsigned c = 0; c < 4; c++) {
sound_channel_volume_base_str[17] = c+'1';
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
gb.getPSG()->setSoChanVolume(unsigned(atoi(var.value)), c);
}
}


#ifdef HAVE_NETWORK

Expand Down
80 changes: 0 additions & 80 deletions libgambatte/libretro/libretro_core_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,86 +322,6 @@ struct retro_core_option_definition option_defs_us[] = {
},
"10"
},
{
"gambatte_channel_1_volume",
"Square 1 Channel volume %",
"Modify Square 1 Volume %.",
{
{ "0", NULL },
{ "10", NULL },
{ "20", NULL },
{ "30", NULL },
{ "40", NULL },
{ "50", NULL },
{ "60", NULL },
{ "70", NULL },
{ "80", NULL },
{ "90", NULL },
{ "100", NULL },
{ NULL, NULL },
},
"100"
},
{
"gambatte_channel_2_volume",
"Square 2 Channel volume %",
"Modify Square 2 Volume %.",
{
{ "0", NULL },
{ "10", NULL },
{ "20", NULL },
{ "30", NULL },
{ "40", NULL },
{ "50", NULL },
{ "60", NULL },
{ "70", NULL },
{ "80", NULL },
{ "90", NULL },
{ "100", NULL },
{ NULL, NULL },
},
"100"
},
{
"gambatte_channel_3_volume",
"Wave Channel volume %",
"Modify Wave Volume %.",
{
{ "0", NULL },
{ "10", NULL },
{ "20", NULL },
{ "30", NULL },
{ "40", NULL },
{ "50", NULL },
{ "60", NULL },
{ "70", NULL },
{ "80", NULL },
{ "90", NULL },
{ "100", NULL },
{ NULL, NULL },
},
"100"
},
{
"gambatte_channel_4_volume",
"Noise Channel volume %",
"Modify Noise Volume %.",
{
{ "0", NULL },
{ "10", NULL },
{ "20", NULL },
{ "30", NULL },
{ "40", NULL },
{ "50", NULL },
{ "60", NULL },
{ "70", NULL },
{ "80", NULL },
{ "90", NULL },
{ "100", NULL },
{ NULL, NULL },
},
"100"
},
#ifdef HAVE_NETWORK
{
"gambatte_show_gb_link_settings",
Expand Down
1 change: 0 additions & 1 deletion libgambatte/src/gambatte-memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ class Memory {
void *rombank1_ptr() const { return cart_.romdata(0) + 0x4000; }
void *zeropage_ptr() const { return (void*)(ioamhram_ + 0x0180); }
void *oamram_ptr() const { return (void*)ioamhram_; }
PSG *psg_ptr() const { return (PSG*)&psg_; }
#else
void loadSavedata() { cart_.loadSavedata(); }
void saveSavedata() { cart_.saveSavedata(); }
Expand Down
4 changes: 0 additions & 4 deletions libgambatte/src/gambatte.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,6 @@ void *GB::zeropage_ptr() const {
void *GB::oamram_ptr() const {
return p_->cpu.oamram_ptr();
}

PSG *GB::getPSG() const {
return p_->cpu.mem_.psg_ptr();
}
#endif

}
Expand Down
21 changes: 4 additions & 17 deletions libgambatte/src/sound.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ namespace gambatte
, rsum_(0x8000) // initialize to 0x8000 to prevent borrows from high word, xor away later
, enabled_(false)
{
// init as full volume
setSoChanVolume(100, 0);
setSoChanVolume(100, 1);
setSoChanVolume(100, 2);
setSoChanVolume(100, 3);
}

void PSG::init(const bool cgb)
Expand Down Expand Up @@ -103,10 +98,10 @@ namespace gambatte
uint_least32_t *const buf = buffer_ + bufferPos_;

std::memset(buf, 0, cycles * sizeof(uint_least32_t));
ch1_.update(buf, (soChVol_[0] * soVol_ * 0x1999999A) >> 32, cycles);
ch2_.update(buf, (soChVol_[1] * soVol_ * 0x1999999A) >> 32, cycles);
ch3_.update(buf, (soChVol_[2] * soVol_ * 0x1999999A) >> 32, cycles);
ch4_.update(buf, (soChVol_[3] * soVol_ * 0x1999999A) >> 32, cycles);
ch1_.update(buf, soVol_, cycles);
ch2_.update(buf, soVol_, cycles);
ch3_.update(buf, soVol_, cycles);
ch4_.update(buf, soVol_, cycles);
}

void PSG::generateSamples(unsigned long const cycleCounter, bool const doubleSpeed)
Expand Down Expand Up @@ -185,14 +180,6 @@ namespace gambatte
soVol_ = (((nr50 & 0x7) + 1) * so1Mul
+ ((nr50 >> 4 & 0x7) + 1) * so2Mul) * 64;
}

void PSG::setSoChanVolume(const unsigned percent, const unsigned ch)
{
if( ch > 3 || percent > 100 )
return; // invalid arg

soChVol_[ch] = int(percent / 10);
}

void PSG::mapSo(const unsigned nr51)
{
Expand Down
2 changes: 0 additions & 2 deletions libgambatte/src/sound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ class PSG {
void setNr44(unsigned data) { ch4_.setNr4(data); }

void setSoVolume(unsigned nr50);
void setSoChanVolume(unsigned percent, unsigned ch);
void mapSo(unsigned nr51);
unsigned getStatus() const;

Expand All @@ -84,7 +83,6 @@ class PSG {
std::size_t bufferPos_;
unsigned long lastUpdate_;
unsigned long soVol_;
unsigned long soChVol_[4];
uint_least32_t rsum_;
bool enabled_;

Expand Down