c64
/
pi1541
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #159 from hpingel/1581romname 

display 1581 rom name after mounting an d81 image on big screen
This commit is contained in:
Stephen White 2019-12-01 12:54:30 +11:00 committed by GitHub
parent 1c3521aa29 28679fa10f
commit 253e26594a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/FileBrowser.cpp
View File

@ -1434,6 +1434,11 @@ void FileBrowser::ClearSelections()
} }
void FileBrowser::ShowDeviceAndROM() void FileBrowser::ShowDeviceAndROM()
{
ShowDeviceAndROM( roms->ROMNames[roms->currentROMIndex] );
}
void FileBrowser::ShowDeviceAndROM( const char* ROMName )
{ {
char buffer[256]; char buffer[256];
u32 textColour = RGBA(0, 0, 0, 0xff); u32 textColour = RGBA(0, 0, 0, 0xff);
@ -1445,7 +1450,7 @@ void FileBrowser::ShowDeviceAndROM()
snprintf(buffer, 256, "Device %2d %*s\r\n" snprintf(buffer, 256, "Device %2d %*s\r\n"
, *deviceID , *deviceID
, roms->GetLongestRomNameLen() , roms->GetLongestRomNameLen()
, roms->ROMNames[roms->currentROMIndex] , ROMName
); );
screenMain->PrintText(false, x, y, buffer, textColour, bgColour); screenMain->PrintText(false, x, y, buffer, textColour, bgColour);
#endif #endif

2
src/FileBrowser.h
View File

@ -187,6 +187,8 @@ public:
void ClearSelections(); void ClearSelections();
void ShowDeviceAndROM(); void ShowDeviceAndROM();
void ShowDeviceAndROM( const char* ROMName );
void ClearScreen(); void ClearScreen();

2
src/main.cpp
View File

@ -651,7 +651,7 @@ EmulatingMode BeginEmulating(FileBrowser* fileBrowser, const char* filenameForIc
{ {
pi1581.Insert(diskImage); pi1581.Insert(diskImage);
fileBrowser->DisplayDiskInfo(diskImage, filenameForIcon); fileBrowser->DisplayDiskInfo(diskImage, filenameForIcon);
fileBrowser->ShowDeviceAndROM(); fileBrowser->ShowDeviceAndROM( roms.ROMName1581 );
return EMULATING_1581; return EMULATING_1581;
} }
else else