mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-06-04 07:12:48 +02:00
(nothing of value, just reindentation and removal of commented out includes. i'm just cleaning my svn client here)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4808 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
ddcb39d8e3
commit
1bca5e8c86
@ -20,8 +20,9 @@
|
||||
|
||||
namespace DiscIO
|
||||
{
|
||||
DriveReader::DriveReader(const char *drive)
|
||||
{
|
||||
|
||||
DriveReader::DriveReader(const char *drive)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
char path[MAX_PATH];
|
||||
strncpy(path, drive, 3);
|
||||
@ -64,18 +65,18 @@ namespace DiscIO
|
||||
{
|
||||
PanicAlert("Load from DVD backup failed or no disc in drive %s", drive);
|
||||
}
|
||||
} // DriveReader::DriveReader
|
||||
} // DriveReader::DriveReader
|
||||
|
||||
DriveReader::~DriveReader()
|
||||
{
|
||||
DriveReader::~DriveReader()
|
||||
{
|
||||
#ifdef _WIN32
|
||||
#ifdef _LOCKDRIVE // Do we want to lock the drive?
|
||||
#ifdef _LOCKDRIVE // Do we want to lock the drive?
|
||||
// Unlock the disc in the CD-ROM drive.
|
||||
pmrLockCDROM.PreventMediaRemoval = FALSE;
|
||||
DeviceIoControl (hDisc, IOCTL_CDROM_MEDIA_REMOVAL,
|
||||
&pmrLockCDROM, sizeof(pmrLockCDROM), NULL,
|
||||
0, &dwNotUsed, NULL);
|
||||
#endif
|
||||
#endif
|
||||
if (hDisc != INVALID_HANDLE_VALUE)
|
||||
{
|
||||
CloseHandle(hDisc);
|
||||
@ -85,10 +86,10 @@ namespace DiscIO
|
||||
fclose(file_);
|
||||
file_ = 0;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
DriveReader *DriveReader::Create(const char *drive)
|
||||
{
|
||||
DriveReader *DriveReader::Create(const char *drive)
|
||||
{
|
||||
DriveReader *reader = new DriveReader(drive);
|
||||
if (!reader->IsOK())
|
||||
{
|
||||
@ -96,10 +97,10 @@ namespace DiscIO
|
||||
return 0;
|
||||
}
|
||||
return reader;
|
||||
}
|
||||
}
|
||||
|
||||
void DriveReader::GetBlock(u64 block_num, u8 *out_ptr)
|
||||
{
|
||||
void DriveReader::GetBlock(u64 block_num, u8 *out_ptr)
|
||||
{
|
||||
u8 * lpSector = new u8[m_blocksize];
|
||||
#ifdef _WIN32
|
||||
u32 NotUsed;
|
||||
@ -115,10 +116,10 @@ namespace DiscIO
|
||||
#endif
|
||||
memcpy(out_ptr, lpSector, m_blocksize);
|
||||
delete[] lpSector;
|
||||
}
|
||||
}
|
||||
|
||||
bool DriveReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr)
|
||||
{
|
||||
bool DriveReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
u32 NotUsed;
|
||||
u64 offset = m_blocksize * block_num;
|
||||
@ -136,5 +137,6 @@ namespace DiscIO
|
||||
return false;
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -28,7 +28,6 @@
|
||||
#include "../TextureMngr.h"
|
||||
#include "VertexShaderManager.h"
|
||||
#include "../PostProcessing.h"
|
||||
//#include "GlobalControl.h"
|
||||
#include "Render.h"
|
||||
|
||||
#include "FileUtil.h"
|
||||
|
@ -32,7 +32,6 @@
|
||||
#include <mmsystem.h>
|
||||
#endif
|
||||
|
||||
//#include "GlobalControl.h"
|
||||
#include "CommonPaths.h"
|
||||
#include "VideoConfig.h"
|
||||
#include "Profiler.h"
|
||||
|
Loading…
x
Reference in New Issue
Block a user