-now compiling with devkitppc r30 and libogc 1.8.19. this fixes the time() issues that occurred with r31 and r32 and libogc 1.8.20.

This commit is contained in:
Fledge68 2018-10-08 06:29:08 -05:00
parent d8964cf185
commit 1f463f9f50
6 changed files with 15 additions and 12 deletions

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 MiB

After

Width:  |  Height:  |  Size: 3.3 MiB

View File

@ -60,8 +60,8 @@ static const devoptab_t gecko_out = {
NULL, // device chmod_r NULL, // device chmod_r
NULL, // device fchmod_r NULL, // device fchmod_r
NULL, // device rmdir_r NULL, // device rmdir_r
NULL, // lstat_r //NULL, // lstat_r
NULL, // utimes_r //NULL, // utimes_r
}; };
static void USBGeckoOutput() static void USBGeckoOutput()

View File

@ -100,11 +100,13 @@ void *light_loop()
timeoff = light_timeoff; timeoff = light_timeoff;
// Turn on the light and sleep for a bit // Turn on the light and sleep for a bit
wiiLightOn(); wiiLightOn();
nanosleep(&timeon, NULL); //nanosleep(&timeon, NULL);
nanosleep(&timeon);
// Turn off the light (if required) and sleep for a bit // Turn off the light (if required) and sleep for a bit
if(timeoff.tv_nsec > 0) if(timeoff.tv_nsec > 0)
wiiLightOff(); wiiLightOff();
nanosleep(&timeoff, NULL); //nanosleep(&timeoff, NULL);
nanosleep(&timeon);
} }
return NULL; return NULL;
} }

View File

@ -1778,17 +1778,15 @@ void CMenu::_mainLoopCommon(bool withCF, bool adjusting)
{ {
m_btnMgr.setText(m_mainLblCurMusic, MusicPlayer.GetFileName(), false);// false for word wrap m_btnMgr.setText(m_mainLblCurMusic, MusicPlayer.GetFileName(), false);// false for word wrap
m_btnMgr.show(m_mainLblCurMusic); m_btnMgr.show(m_mainLblCurMusic);
m_musicTimer = 180; MusicPlayer.DisplayTime = time(NULL);
} }
// hide song title if it's displaying and been >3 seconds // hide song title if it's displaying and been >3 seconds
if(m_musicTimer > 0) else if(MusicPlayer.DisplayTime > 0 && time(NULL) - MusicPlayer.DisplayTime > 3)
{
if(--m_musicTimer == 0)
{ {
MusicPlayer.DisplayTime = 0;
m_btnMgr.hide(m_mainLblCurMusic); m_btnMgr.hide(m_mainLblCurMusic);
if(MusicPlayer.OneSong) m_music_info = false; if(MusicPlayer.OneSong) m_music_info = false;
} }
}
//Take Screenshot //Take Screenshot
if(WBTN_Z_PRESSED || GBTN_Z_PRESSED) if(WBTN_Z_PRESSED || GBTN_Z_PRESSED)

View File

@ -262,6 +262,9 @@ void CMenu::_updateSourceBtns(void)
else else
snprintf(btn_image, sizeof(btn_image), "%s", m_source.getString(current_btn,"image", "").c_str()); snprintf(btn_image, sizeof(btn_image), "%s", m_source.getString(current_btn,"image", "").c_str());
//char btn_image_s[255];
//snprintf(btn_image_s, sizeof(btn_image_s), "%s", m_source.getString(current_btn,"image_s", "").c_str());
TexData texConsoleImg; TexData texConsoleImg;
TexData texConsoleImgs; TexData texConsoleImgs;
if(TexHandle.fromImageFile(texConsoleImg, fmt("%s/%s/%s", m_sourceDir.c_str(), themeName, btn_image)) != TE_OK) if(TexHandle.fromImageFile(texConsoleImg, fmt("%s/%s/%s", m_sourceDir.c_str(), themeName, btn_image)) != TE_OK)