From 6eee4cb38aabc85e1dd4e1d4941a755889174512 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Mon, 6 Dec 2021 01:34:47 -0600 Subject: [PATCH] Core: Remove empty file Had everything commented out and there's already a file with the same name and things not commented out in CDVD --- pcsx2/CMakeLists.txt | 1 - pcsx2/OutputIsoFile.cpp | 148 ---------------------------------------- 2 files changed, 149 deletions(-) delete mode 100644 pcsx2/OutputIsoFile.cpp diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index c5652293be..812879e5c7 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -139,7 +139,6 @@ set(pcsx2Sources MTGS.cpp MTVU.cpp MultipartFileReader.cpp - OutputIsoFile.cpp Patch.cpp Patch_Memory.cpp Pcsx2Config.cpp diff --git a/pcsx2/OutputIsoFile.cpp b/pcsx2/OutputIsoFile.cpp deleted file mode 100644 index a712883e74..0000000000 --- a/pcsx2/OutputIsoFile.cpp +++ /dev/null @@ -1,148 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - - -#include "PrecompiledHeader.h" -#include "IopCommon.h" -#include "CDVD/IsoFileFormats.h" - -#include - -/* -void pxStream_OpenCheck( const wxStreamBase& stream, const wxString& fname, const wxString& mode ) -{ - if (stream.IsOk()) return; - - ScopedExcept ex(Exception::FromErrno(fname, errno)); - ex->SetDiagMsg( pxsFmt(L"Unable to open the file for %s: %s", mode.c_str(), ex->DiagMsg().c_str()) ); - ex->Rethrow(); -} - -OutputIsoFile::OutputIsoFile() -{ - _init(); -} - -OutputIsoFile::~OutputIsoFile() -{ - Close(); -} - -void OutputIsoFile::_init() -{ - m_type = ISOTYPE_ILLEGAL; - m_flags = 0; - - m_offset = 0; - m_blockofs = 0; - m_blocksize = 0; - m_blocks = 0; - - m_dtable = 0; - m_dtablesize = 0; -} - -void OutputIsoFile::Create(const wxString& filename, int flags) -{ - Close(); - m_filename = filename; - - m_flags = flags; - m_offset = 0; - m_blockofs = 24; - m_blocksize = 2048; - - m_outstream = new wxFileOutputStream( m_filename ); - pxStream_OpenCheck( *m_outstream, m_filename, L"writing" ); - - Console.WriteLn("isoFile create ok: %s ", m_filename.c_str()); -} - -// Generates format header information for blockdumps. -void OutputIsoFile::WriteFormat(int _blockofs, uint _blocksize, uint _blocks) -{ - m_blocksize = _blocksize; - m_blocks = _blocks; - m_blockofs = _blockofs; - - Console.WriteLn("blockoffset = %d", m_blockofs); - Console.WriteLn("blocksize = %u", m_blocksize); - Console.WriteLn("blocks = %u", m_blocks); - - if (m_flags & ISOFLAGS_BLOCKDUMP_V2) - { - outWrite("BDV2", 4); - outWrite(m_blocksize); - outWrite(m_blocks); - outWrite(m_blockofs); - } -} - -void OutputIsoFile::_WriteBlock(const u8* src, uint lsn) -{ - wxFileOffset ofs = (wxFileOffset)lsn * m_blocksize + m_offset; - - m_outstream->SeekO( ofs ); - outWrite( src + m_blockofs, m_blocksize ); -} - -void OutputIsoFile::_WriteBlockD(const u8* src, uint lsn) -{ - // Find and ignore blocks that have already been dumped: - for (int i=0; i( lsn ); - outWrite( src + m_blockofs, m_blocksize ); -} - -void OutputIsoFile::WriteBlock(const u8* src, uint lsn) -{ - if (m_flags == ISOFLAGS_BLOCKDUMP_V2) - _WriteBlockD(src, lsn); - else - _WriteBlock(src, lsn); -} - -void OutputIsoFile::Close() -{ - m_dtable.Delete(); - - _init(); -} - -void OutputIsoFile::outWrite( const void* src, size_t size ) -{ - m_outstream->Write(src, size); - if(m_outstream->GetLastError() == wxSTREAM_WRITE_ERROR) - { - int err = errno; - if (!err) - throw Exception::BadStream(m_filename).SetDiagMsg(pxsFmt(L"An error occurred while writing %u bytes to file", size)); - - ScopedExcept ex(Exception::FromErrno(m_filename, err)); - ex->SetDiagMsg( pxsFmt(L"An error occurred while writing %u bytes to file: %s", size, ex->DiagMsg().c_str()) ); - ex->Rethrow(); - } -} - -bool OutputIsoFile::IsOpened() const -{ - return m_outstream && m_outstream->IsOk(); -} -*/