empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement 2nd version of the Disc Control interface.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2021-11-27 13:45:34 +00:00
parent 117502b774
commit 741849a026
3 changed files with 79 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
source/frontends/libretro/diskcontrol.cpp
View file

@ -80,7 +80,7 @@ namespace ra2
{
if (myEjected == ejected)
{
return true;
return true; // or false?
}
CardManager & cardManager = GetCardMgr();
@ -151,7 +151,7 @@ namespace ra2
if (myIndex < myImages.size())
{
myImages.erase(myImages.begin() + index);
if (myIndex == index)
if (myImages.empty() || myIndex == index)
{
myIndex = myImages.size();
}
@ -173,4 +173,37 @@ namespace ra2
return true;
}
bool DiskControl::getImagePath(unsigned index, char *path, size_t len) const
{
if (index < myImages.size())
{
strncpy(path, myImages[index].c_str(), len);
path[len - 1] = 0;
return true;
}
else
{
return false;
}
}
bool DiskControl::getImageLabel(unsigned index, char *label, size_t len) const
{
if (index < myImages.size())
{
size_t pos = myImages[index].rfind('/');
if (pos == std::string::npos)
{
pos = 0;
}
strncpy(label, myImages[index].c_str() + pos + 1, len);
label[len - 1] = 0;
return true;
}
else
{
return false;
}
}
}

3
source/frontends/libretro/diskcontrol.h
View file

@ -23,6 +23,9 @@ namespace ra2
bool insertDisk(const std::string & filename);
bool getImagePath(unsigned index, char *path, size_t len) const;
bool getImageLabel(unsigned index, char *label, size_t len) const;
private:
std::vector<std::string> myImages;

45
source/frontends/libretro/libretro.cpp
View file

@ -80,6 +80,25 @@ namespace
return ourGame->getDiskControl().addImageIndex();
}
bool retro_set_initial_image(unsigned index, const char *path)
{
ra2::log_cb(RETRO_LOG_INFO, "RA2: %s (%d) = %s\n", __FUNCTION__, index, path);
// I have not been able to trigger this yet.
return false;
}
bool retro_get_image_path(unsigned index, char *path, size_t len)
{
ra2::log_cb(RETRO_LOG_INFO, "RA2: %s (%d)\n", __FUNCTION__, index);
return ourGame->getDiskControl().getImagePath(index, path, len);
}
bool retro_get_image_label(unsigned index, char *label, size_t len)
{
ra2::log_cb(RETRO_LOG_INFO, "RA2: %s (%d)\n", __FUNCTION__, index);
return ourGame->getDiskControl().getImageLabel(index, label, len);
}
}
void retro_init(void)
@ -201,10 +220,28 @@ void retro_set_environment(retro_environment_t cb)
bool achievements = true;
cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &achievements);
static retro_disk_control_callback diskControlCallback = {
&retro_set_eject_state, &retro_get_eject_state, &retro_get_image_index, &retro_set_image_index, &retro_get_num_images, &retro_replace_image_index, &retro_add_image_index
};
cb(RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE, &diskControlCallback);
unsigned dciVersion = 0;
if (cb(RETRO_ENVIRONMENT_GET_DISK_CONTROL_INTERFACE_VERSION, &dciVersion) && (dciVersion >= 1))
{
retro_disk_control_ext_callback diskControlExtCallback = {
&retro_set_eject_state, &retro_get_eject_state,
&retro_get_image_index, &retro_set_image_index,
&retro_get_num_images, &retro_replace_image_index,
&retro_add_image_index, &retro_set_initial_image,
&retro_get_image_path, &retro_get_image_label
};
cb(RETRO_ENVIRONMENT_SET_DISK_CONTROL_EXT_INTERFACE, &diskControlExtCallback);
}
else
{
retro_disk_control_callback diskControlCallback = {
&retro_set_eject_state, &retro_get_eject_state,
&retro_get_image_index, &retro_set_image_index,
&retro_get_num_images, &retro_replace_image_index,
&retro_add_image_index
};
cb(RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE, &diskControlCallback);
}
ra2::SetupRetroVariables();
}