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

Fixed issue #134

This commit is contained in:
Stephen White 2019-11-17 14:36:56 +11:00
parent 6ea55bd013
commit b1ce1f5d33
2 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/DiskCaddy.cpp
View File

@ -41,7 +41,7 @@ bool DiskCaddy::Empty()
for (index = 0; index < (int)disks.size(); ++index) for (index = 0; index < (int)disks.size(); ++index)
{ {
if (disks[index].IsDirty()) if (disks[index]->IsDirty())
{ {
anyDirty = true; anyDirty = true;
#if not defined(EXPERIMENTALZERO) #if not defined(EXPERIMENTALZERO)
@ -50,7 +50,7 @@ bool DiskCaddy::Empty()
x = screen->ScaleX(screenPosXCaddySelections); x = screen->ScaleX(screenPosXCaddySelections);
y = screen->ScaleY(screenPosYCaddySelections); y = screen->ScaleY(screenPosYCaddySelections);
snprintf(buffer, 256, "Saving %s\r\n", disks[index].GetName()); snprintf(buffer, 256, "Saving %s\r\n", disks[index]->GetName());
screen->PrintText(false, x, y, buffer, RGBA(0xff, 0xff, 0xff, 0xff), red); screen->PrintText(false, x, y, buffer, RGBA(0xff, 0xff, 0xff, 0xff), red);
} }
#endif #endif
@ -64,12 +64,13 @@ bool DiskCaddy::Empty()
snprintf(buffer, 256, "Saving"); snprintf(buffer, 256, "Saving");
screenLCD->PrintText(false, x, y, buffer, RGBA(0xff, 0xff, 0xff, 0xff), BkColour); screenLCD->PrintText(false, x, y, buffer, RGBA(0xff, 0xff, 0xff, 0xff), BkColour);
y += screenLCD->GetFontHeight(); y += screenLCD->GetFontHeight();
snprintf(buffer, 256, "%s ", disks[index].GetName()); snprintf(buffer, 256, "%s ", disks[index]->GetName());
screenLCD->PrintText(false, x, y, buffer, RGBA(0xff, 0xff, 0xff, 0xff), red); screenLCD->PrintText(false, x, y, buffer, RGBA(0xff, 0xff, 0xff, 0xff), red);
screenLCD->SwapBuffers(); screenLCD->SwapBuffers();
} }
} }
disks[index].Close(); disks[index]->Close();
delete disks[index];
} }
if (anyDirty) if (anyDirty)
@ -120,6 +121,9 @@ bool DiskCaddy::Insert(const FILINFO* fileInfo, bool readOnly)
x = screen->ScaleX(screenPosXCaddySelections); x = screen->ScaleX(screenPosXCaddySelections);
y = screen->ScaleY(screenPosYCaddySelections); y = screen->ScaleY(screenPosYCaddySelections);
snprintf(buffer, 256, " \r\n");
screen->PrintText(false, x, y, buffer, RGBA(0xff, 0xff, 0xff, 0xff), red);
snprintf(buffer, 256, "Loading %s\r\n", fileInfo->fname); snprintf(buffer, 256, "Loading %s\r\n", fileInfo->fname);
screen->PrintText(false, x, y, buffer, RGBA(0xff, 0xff, 0xff, 0xff), red); screen->PrintText(false, x, y, buffer, RGBA(0xff, 0xff, 0xff, 0xff), red);
} }
@ -188,82 +192,88 @@ bool DiskCaddy::Insert(const FILINFO* fileInfo, bool readOnly)
bool DiskCaddy::InsertD64(const FILINFO* fileInfo, unsigned char* diskImageData, unsigned size, bool readOnly) bool DiskCaddy::InsertD64(const FILINFO* fileInfo, unsigned char* diskImageData, unsigned size, bool readOnly)
{ {
DiskImage diskImage; DiskImage* diskImage = new DiskImage();
if (diskImage.OpenD64(fileInfo, diskImageData, size)) if (diskImage->OpenD64(fileInfo, diskImageData, size))
{ {
diskImage.SetReadOnly(readOnly); diskImage->SetReadOnly(readOnly);
disks.push_back(diskImage); disks.push_back(diskImage);
selectedIndex = disks.size() - 1; selectedIndex = disks.size() - 1;
return true; return true;
} }
delete diskImage;
return false; return false;
} }
bool DiskCaddy::InsertG64(const FILINFO* fileInfo, unsigned char* diskImageData, unsigned size, bool readOnly) bool DiskCaddy::InsertG64(const FILINFO* fileInfo, unsigned char* diskImageData, unsigned size, bool readOnly)
{ {
DiskImage diskImage; DiskImage* diskImage = new DiskImage();
if (diskImage.OpenG64(fileInfo, diskImageData, size)) if (diskImage->OpenG64(fileInfo, diskImageData, size))
{ {
diskImage.SetReadOnly(readOnly); diskImage->SetReadOnly(readOnly);
disks.push_back(diskImage); disks.push_back(diskImage);
//DEBUG_LOG("Disks size = %d\r\n", disks.size()); //DEBUG_LOG("Disks size = %d\r\n", disks.size());
selectedIndex = disks.size() - 1; selectedIndex = disks.size() - 1;
return true; return true;
} }
delete diskImage;
return false; return false;
} }
bool DiskCaddy::InsertNIB(const FILINFO* fileInfo, unsigned char* diskImageData, unsigned size, bool readOnly) bool DiskCaddy::InsertNIB(const FILINFO* fileInfo, unsigned char* diskImageData, unsigned size, bool readOnly)
{ {
DiskImage diskImage; DiskImage* diskImage = new DiskImage();
if (diskImage.OpenNIB(fileInfo, diskImageData, size)) if (diskImage->OpenNIB(fileInfo, diskImageData, size))
{ {
// At the moment we cannot write out NIB files. // At the moment we cannot write out NIB files.
diskImage.SetReadOnly(true);// readOnly); diskImage->SetReadOnly(true);// readOnly);
disks.push_back(diskImage); disks.push_back(diskImage);
selectedIndex = disks.size() - 1; selectedIndex = disks.size() - 1;
return true; return true;
} }
delete diskImage;
return false; return false;
} }
bool DiskCaddy::InsertNBZ(const FILINFO* fileInfo, unsigned char* diskImageData, unsigned size, bool readOnly) bool DiskCaddy::InsertNBZ(const FILINFO* fileInfo, unsigned char* diskImageData, unsigned size, bool readOnly)
{ {
DiskImage diskImage; DiskImage* diskImage = new DiskImage();
if (diskImage.OpenNBZ(fileInfo, diskImageData, size)) if (diskImage->OpenNBZ(fileInfo, diskImageData, size))
{ {
// At the moment we cannot write out NIB files. // At the moment we cannot write out NIB files.
diskImage.SetReadOnly(true);// readOnly); diskImage->SetReadOnly(true);// readOnly);
disks.push_back(diskImage); disks.push_back(diskImage);
selectedIndex = disks.size() - 1; selectedIndex = disks.size() - 1;
return true; return true;
} }
delete diskImage;
return false; return false;
} }
bool DiskCaddy::InsertD81(const FILINFO* fileInfo, unsigned char* diskImageData, unsigned size, bool readOnly) bool DiskCaddy::InsertD81(const FILINFO* fileInfo, unsigned char* diskImageData, unsigned size, bool readOnly)
{ {
DiskImage diskImage; DiskImage* diskImage = new DiskImage();
if (diskImage.OpenD81(fileInfo, diskImageData, size)) if (diskImage->OpenD81(fileInfo, diskImageData, size))
{ {
diskImage.SetReadOnly(readOnly); diskImage->SetReadOnly(readOnly);
disks.push_back(diskImage); disks.push_back(diskImage);
selectedIndex = disks.size() - 1; selectedIndex = disks.size() - 1;
return true; return true;
} }
delete diskImage;
return false; return false;
} }
bool DiskCaddy::InsertT64(const FILINFO* fileInfo, unsigned char* diskImageData, unsigned size, bool readOnly) bool DiskCaddy::InsertT64(const FILINFO* fileInfo, unsigned char* diskImageData, unsigned size, bool readOnly)
{ {
DiskImage diskImage; DiskImage* diskImage = new DiskImage();
if (diskImage.OpenT64(fileInfo, diskImageData, size)) if (diskImage->OpenT64(fileInfo, diskImageData, size))
{ {
diskImage.SetReadOnly(readOnly); diskImage->SetReadOnly(readOnly);
disks.push_back(diskImage); disks.push_back(diskImage);
selectedIndex = disks.size() - 1; selectedIndex = disks.size() - 1;
return true; return true;
} }
delete diskImage;
return false; return false;
} }

15
src/DiskCaddy.h
View File

@ -52,7 +52,7 @@ public:
Update(); Update();
#endif #endif
if (selectedIndex < disks.size()) if (selectedIndex < disks.size())
return &disks[selectedIndex]; return disks[selectedIndex];
return 0; return 0;
} }
@ -60,24 +60,21 @@ public:
DiskImage* NextDisk() DiskImage* NextDisk()
{ {
selectedIndex = (selectedIndex + 1) % (u32)disks.size(); selectedIndex = (selectedIndex + 1) % (u32)disks.size();
auto ret = GetCurrentDisk();
return GetCurrentDisk(); return GetCurrentDisk();
} }
DiskImage* PrevDisk() DiskImage* PrevDisk()
{ {
if (selectedIndex == 0u) --selectedIndex;
selectedIndex += (u32)disks.size()-1; if ((int)selectedIndex < 0)
else selectedIndex += (u32)disks.size();
--selectedIndex;
return GetCurrentDisk(); return GetCurrentDisk();
} }
u32 GetNumberOfImages() const { return disks.size(); } u32 GetNumberOfImages() const { return disks.size(); }
u32 GetSelectedIndex() const { return selectedIndex; } u32 GetSelectedIndex() const { return selectedIndex; }
DiskImage* GetImage(unsigned index) { return &disks[index]; } DiskImage* GetImage(unsigned index) { return disks[index]; }
DiskImage* SelectImage(unsigned index) DiskImage* SelectImage(unsigned index)
{ {
if (selectedIndex != index && index < disks.size()) if (selectedIndex != index && index < disks.size())
@ -110,7 +107,7 @@ private:
void ShowSelectedImage(u32 index); void ShowSelectedImage(u32 index);
std::vector<DiskImage> disks; std::vector<DiskImage*> disks;
u32 selectedIndex; u32 selectedIndex;
u32 oldCaddyIndex; u32 oldCaddyIndex;
#if not defined(EXPERIMENTALZERO) #if not defined(EXPERIMENTALZERO)