The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2024-11-26 05:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: Remove most references of "Network::is_master" and make it

Browse Source 
non-static. C64::network_connection_state should be used instead
This commit is contained in:
simon.kagstrom 2009-11-04 16:43:47 +00:00
parent 3029688fc6
commit a16a2c3d18
5 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Src/C64_SDL.h
View File

@ -494,7 +494,7 @@ void C64::network_vblank()
TheDisplay->display_status_string("WAITING FOR CONNECTION...", 1); TheDisplay->display_status_string("WAITING FOR CONNECTION...", 1);
if (err == OK) { if (err == OK) {
if (Network::is_master) if (this->peer->is_master)
this->network_connection_type = MASTER; this->network_connection_type = MASTER;
else else
this->network_connection_type = CLIENT; this->network_connection_type = CLIENT;

25
Src/Network.cpp
View File

@ -50,7 +50,7 @@ Network::Network(const char *remote_host, int port)
this->InitNetwork(); this->InitNetwork();
Network::is_master = true; /* Assume true */ this->is_master = true; /* Assume true */
this->connected = false; this->connected = false;
/* "big enough" buffer */ /* "big enough" buffer */
@ -290,7 +290,7 @@ void Network::EncodeScreenshot(Uint8 *dst, Uint8 *master)
void Network::EncodeDisplay(Uint8 *master, Uint8 *remote) void Network::EncodeDisplay(Uint8 *master, Uint8 *remote)
{ {
if (!Network::is_master) if (!this->network_connection_state == MASTER)
return; return;
for ( int sq = 0; sq < N_SQUARES_H * N_SQUARES_W; sq++ ) for ( int sq = 0; sq < N_SQUARES_H * N_SQUARES_W; sq++ )
{ {
@ -470,7 +470,7 @@ void Network::EncodeSound()
/* This is not enabled yet... */ /* This is not enabled yet... */
return; return;
/* Nothing to encode? */ /* Nothing to encode? */
if (!Network::is_master || if (this->network_connection_state != MASTER ||
this->GetSoundBufferSize() < NETWORK_SOUND_BUF_SIZE / 2) this->GetSoundBufferSize() < NETWORK_SOUND_BUF_SIZE / 2)
return; return;
@ -501,7 +501,7 @@ void Network::EncodeJoystickUpdate(Uint8 v)
struct NetworkUpdate *dst = this->cur_ud; struct NetworkUpdate *dst = this->cur_ud;
struct NetworkUpdateJoystick *j = (NetworkUpdateJoystick *)dst->data; struct NetworkUpdateJoystick *j = (NetworkUpdateJoystick *)dst->data;
if (Network::is_master || this->cur_joystick_data == v) if (this->network_connection_state == MASTER || this->cur_joystick_data == v)
return; return;
dst = InitNetworkUpdate(dst, JOYSTICK_UPDATE, dst = InitNetworkUpdate(dst, JOYSTICK_UPDATE,
sizeof(NetworkUpdate) + sizeof(NetworkUpdateJoystick)); sizeof(NetworkUpdate) + sizeof(NetworkUpdateJoystick));
@ -886,7 +886,7 @@ bool Network::DecodeUpdate(C64Display *display, uint8 *js, MOS6581 *dst)
case SOUND_UPDATE_RAW: case SOUND_UPDATE_RAW:
case SOUND_UPDATE_RLE: case SOUND_UPDATE_RLE:
/* No sound updates _to_ the master */ /* No sound updates _to_ the master */
if (Network::is_master) if (this->network_connection_state == MASTER)
break; break;
if (this->DecodeSoundUpdate(p, dst) == false) if (this->DecodeSoundUpdate(p, dst) == false)
out = false; out = false;
@ -895,14 +895,14 @@ bool Network::DecodeUpdate(C64Display *display, uint8 *js, MOS6581 *dst)
case DISPLAY_UPDATE_RLE: case DISPLAY_UPDATE_RLE:
case DISPLAY_UPDATE_DIFF: case DISPLAY_UPDATE_DIFF:
/* No screen updates _to_ the master */ /* No screen updates _to_ the master */
if (Network::is_master) if (this->network_connection_state == MASTER)
break; break;
if (this->DecodeDisplayUpdate(p) == false) if (this->DecodeDisplayUpdate(p) == false)
out = false; out = false;
break; break;
case JOYSTICK_UPDATE: case JOYSTICK_UPDATE:
/* No joystick updates _from_ the master */ /* No joystick updates _from_ the master */
if (js && Network::is_master) if (js && this->network_connection_state == MASTER)
{ {
NetworkUpdateJoystick *j = (NetworkUpdateJoystick *)p->data; NetworkUpdateJoystick *j = (NetworkUpdateJoystick *)p->data;
*js = j->val; *js = j->val;
@ -1087,10 +1087,8 @@ network_connection_error_t Network::WaitForPeerList()
if (sel == 0) { if (sel == 0) {
/* We want to wait for a connection, and are therefore /* We want to wait for a connection, and are therefore
* implicitly a master */ * implicitly a master */
Network::is_master = true;
return NO_PEERS_ERROR; return NO_PEERS_ERROR;
} }
Network::is_master = false;
/* Correct the index */ /* Correct the index */
sel--; sel--;
/* Setup the peer info */ /* Setup the peer info */
@ -1179,10 +1177,14 @@ network_connection_error_t Network::ConnectFSM()
case CONN_WAIT_FOR_PEER_LIST: case CONN_WAIT_FOR_PEER_LIST:
/* Also tells the broker that we want to connect */ /* Also tells the broker that we want to connect */
err = this->WaitForPeerList(); err = this->WaitForPeerList();
if (err == OK) if (err == OK) {
this->network_connection_state = CONN_CONNECT_TO_PEER; this->network_connection_state = CONN_CONNECT_TO_PEER;
else if (err == NO_PEERS_ERROR) this->is_master = false;
}
else if (err == NO_PEERS_ERROR) {
this->network_connection_state = CONN_WAIT_FOR_PEER_ADDRESS; this->network_connection_state = CONN_WAIT_FOR_PEER_ADDRESS;
this->is_master = true;
}
else else
return err; return err;
break; break;
@ -1226,7 +1228,6 @@ void Network::Disconnect()
uint8 Network::sample_buf[NETWORK_SOUND_BUF_SIZE]; uint8 Network::sample_buf[NETWORK_SOUND_BUF_SIZE];
int Network::sample_head; int Network::sample_head;
int Network::sample_tail; int Network::sample_tail;
bool Network::is_master = true; /* Assume until set false */
bool Network::networking_started = false; bool Network::networking_started = false;
#if defined(GEKKO) #if defined(GEKKO)

2
Src/Network.h
View File

@ -228,7 +228,7 @@ public:
static void PushSound(uint8 vol); static void PushSound(uint8 vol);
static bool is_master; /* Some peers are more equal than others */ bool is_master; /* Some peers are more equal than others */
protected: protected:
void InitNetwork(); void InitNetwork();

4
Src/SID_linux.h
View File

@ -144,9 +144,7 @@ void DigitalRenderer::EmulateLine(void)
{ {
if (!ready) if (!ready)
return; return;
Network::PushSound(volume); this->PushVolume(volume);
if (Network::is_master)
this->PushVolume(volume);
} }

4
Src/SID_wii.h
View File

@ -94,7 +94,5 @@ void DigitalRenderer::EmulateLine(void)
{ {
if (!ready) if (!ready)
return; return;
Network::PushSound(volume); this->PushVolume(volume);
if (Network::is_master)
this->PushVolume(volume);
} }