piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of VolumeHandler

Browse Source 
VolumeHandler is basically just a wrapper around a single IVolume object.
This change moves that object to DVDInterface, moves the Read32
function to IVolume, and gets rid of the rest of VolumeHandler.
This commit is contained in:
JosJuice
2015-04-05 10:09:48 +02:00
parent bcc434095d
commit 4cd00e366c
15 changed files with 98 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/HW/DVDInterface.h
View File

@ -5,7 +5,9 @@
#pragma once
#include <string>
#include "Common/CommonTypes.h"
#include "DiscIO/Volume.h"
class PointerWrap;
namespace MMIO { class Mapping; }
@ -91,6 +93,12 @@ void DoState(PointerWrap &p);
void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
// Direct disc access
const DiscIO::IVolume& GetVolume();
bool SetVolumeName(const std::string& disc_path);
bool SetVolumeDirectory(const std::string& disc_path, bool is_wii, const std::string& apploader_path = "", const std::string& DOL_path = "");
bool VolumeIsValid();
// Disc detection and swapping
void SetDiscInside(bool _DiscInside);
bool IsDiscInside();
@ -99,6 +107,7 @@ void ChangeDisc(const std::string& fileName);
// DVD Access Functions
bool DVDRead(u64 _iDVDOffset, u32 _iRamAddress, u32 _iLength, bool decrypt);
extern bool g_bStream;
bool ChangePartition(u64 offset);
void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_address, u32 output_length,
bool write_to_DIIMMBUF, int callback_event_type);