[Scummvm-git-logs] scummvm master -> a700883e6f52d0e9717d7570d2f812bf20affc0f
lephilousophe
noreply at scummvm.org
Sun Nov 19 10:35:44 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a700883e6f JANITORIAL: Fix spaces vs tab mismatch
Commit: a700883e6f52d0e9717d7570d2f812bf20affc0f
https://github.com/scummvm/scummvm/commit/a700883e6f52d0e9717d7570d2f812bf20affc0f
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-11-19T11:35:35+01:00
Commit Message:
JANITORIAL: Fix spaces vs tab mismatch
Changed paths:
audio/rate.cpp
audio/rate.h
common/compression/installshield_cab.cpp
video/qt_decoder.cpp
diff --git a/audio/rate.cpp b/audio/rate.cpp
index 98dea4d5cfd..3b4db4c6867 100644
--- a/audio/rate.cpp
+++ b/audio/rate.cpp
@@ -76,15 +76,15 @@ private:
/** Current sample(s) in the input stream (left/right channel) */
st_sample_t _inCurL, _inCurR;
- int copyConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t vol_l, st_volume_t vol_r);
- int simpleConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t vol_l, st_volume_t vol_r);
- int interpolateConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t vol_l, st_volume_t vol_r);
+ int copyConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t vol_l, st_volume_t vol_r);
+ int simpleConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t vol_l, st_volume_t vol_r);
+ int interpolateConvert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t vol_l, st_volume_t vol_r);
public:
- RateConverter_Impl(st_rate_t inputRate, st_rate_t outputRate);
- virtual ~RateConverter_Impl() {}
+ RateConverter_Impl(st_rate_t inputRate, st_rate_t outputRate);
+ virtual ~RateConverter_Impl() {}
- int convert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t vol_l, st_volume_t vol_r) override;
+ int convert(AudioStream &input, st_sample_t *outBuffer, st_size_t numSamples, st_volume_t vol_l, st_volume_t vol_r) override;
void setInputRate(st_rate_t inputRate) override { _inRate = inputRate; }
void setOutputRate(st_rate_t outputRate) override { _outRate = outputRate; }
@@ -307,7 +307,7 @@ int RateConverter_Impl<inStereo, outStereo, reverseStereo>::convert(AudioStream
}
RateConverter *makeRateConverter(st_rate_t inRate, st_rate_t outRate, bool inStereo, bool outStereo, bool reverseStereo) {
- if (inStereo) {
+ if (inStereo) {
if (outStereo) {
if (reverseStereo)
return new RateConverter_Impl<true, true, true>(inRate, outRate);
diff --git a/audio/rate.h b/audio/rate.h
index f7f498de7b5..637a83e99fd 100644
--- a/audio/rate.h
+++ b/audio/rate.h
@@ -75,9 +75,9 @@ static inline int16 clampedAdd(int16& a, int b) {
*/
class RateConverter {
public:
- RateConverter() {}
+ RateConverter() {}
virtual ~RateConverter() {}
-
+
/**
* Convert the provided AudioStream to the target sample rate.
*
diff --git a/common/compression/installshield_cab.cpp b/common/compression/installshield_cab.cpp
index ec9b0b2f3e9..52319028407 100644
--- a/common/compression/installshield_cab.cpp
+++ b/common/compression/installshield_cab.cpp
@@ -127,7 +127,7 @@ private:
FileMap _map;
String _baseName;
Common::Array<VolumeHeader> _volumeHeaders;
- bool _useSearchMan;
+ bool _useSearchMan;
static bool readVolumeHeader(SeekableReadStream *volumeStream, VolumeHeader &inVolumeHeader);
@@ -139,20 +139,20 @@ InstallShieldCabinet::InstallShieldCabinet() : _version(0), _useSearchMan(false)
}
bool InstallShieldCabinet::open(const String *baseName, const FSNode *node) {
- // Store the base name so we can generate file names
- if (baseName) {
- _baseName = *baseName;
- _useSearchMan = true;
- } else if (node) {
- _baseName = node->getPath();
- _useSearchMan = false;
- } else {
- return false;
- }
-
- if (_baseName.hasSuffix(".cab") || _baseName.hasSuffix(".hdr")) {
- _baseName.erase(_baseName.size() - 5, String::npos);
- }
+ // Store the base name so we can generate file names
+ if (baseName) {
+ _baseName = *baseName;
+ _useSearchMan = true;
+ } else if (node) {
+ _baseName = node->getPath();
+ _useSearchMan = false;
+ } else {
+ return false;
+ }
+
+ if (_baseName.hasSuffix(".cab") || _baseName.hasSuffix(".hdr")) {
+ _baseName.erase(_baseName.size() - 5, String::npos);
+ }
uint fileIndex = 0;
ScopedPtr<SeekableReadStream> file;
@@ -160,38 +160,38 @@ bool InstallShieldCabinet::open(const String *baseName, const FSNode *node) {
// First, open all the .cab files and read their headers
uint volume = 1;
for (;;) {
- if (_useSearchMan) {
- file.reset(SearchMan.createReadStreamForMember(getVolumeName(volume++)));
- if (!file.get()) {
- break;
- }
- } else {
- file.reset(new Common::File());
- if (!((Common::File *)file.get())->open(Common::FSNode(getVolumeName(volume++)))) {
- break;
- }
- }
+ if (_useSearchMan) {
+ file.reset(SearchMan.createReadStreamForMember(getVolumeName(volume++)));
+ if (!file.get()) {
+ break;
+ }
+ } else {
+ file.reset(new Common::File());
+ if (!((Common::File *)file.get())->open(Common::FSNode(getVolumeName(volume++)))) {
+ break;
+ }
+ }
_volumeHeaders.push_back(VolumeHeader());
readVolumeHeader(file.get(), _volumeHeaders.back());
}
// Try to open a header (.hdr) file to get the file list
- if (_useSearchMan) {
- file.reset(SearchMan.createReadStreamForMember(getHeaderName()));
- if (!file) {
- // No header file is present, file list is in first .cab file
- file.reset(SearchMan.createReadStreamForMember(getVolumeName(1)));
- }
- } else {
- file.reset(new Common::File());
- if (!((Common::File *)file.get())->open(Common::FSNode(getHeaderName()))) {
- // No header file is present, file list is in first .cab file
- if (!((Common::File *)file.get())->open(Common::FSNode(getVolumeName(1)))) {
- file.reset(nullptr);
- }
- }
- }
+ if (_useSearchMan) {
+ file.reset(SearchMan.createReadStreamForMember(getHeaderName()));
+ if (!file) {
+ // No header file is present, file list is in first .cab file
+ file.reset(SearchMan.createReadStreamForMember(getVolumeName(1)));
+ }
+ } else {
+ file.reset(new Common::File());
+ if (!((Common::File *)file.get())->open(Common::FSNode(getHeaderName()))) {
+ // No header file is present, file list is in first .cab file
+ if (!((Common::File *)file.get())->open(Common::FSNode(getVolumeName(1)))) {
+ file.reset(nullptr);
+ }
+ }
+ }
if (!file) {
close();
@@ -326,7 +326,7 @@ bool InstallShieldCabinet::open(const String *baseName, const FSNode *node) {
void InstallShieldCabinet::close() {
_baseName.clear();
_map.clear();
- _volumeHeaders.clear();
+ _volumeHeaders.clear();
_version = 0;
}
@@ -353,20 +353,20 @@ SeekableReadStream *InstallShieldCabinet::createReadStreamForMember(const Path &
const FileEntry &entry = _map[name];
- if (entry.flags & kObfuscated) {
- warning("Cannot extract obfuscated file %s", name.c_str());
- return nullptr;
- }
+ if (entry.flags & kObfuscated) {
+ warning("Cannot extract obfuscated file %s", name.c_str());
+ return nullptr;
+ }
ScopedPtr<SeekableReadStream> stream;
- if (_useSearchMan) {
- stream.reset(SearchMan.createReadStreamForMember(getVolumeName((entry.volume))));
- } else {
- stream.reset(new Common::File());
- if (!((Common::File *)stream.get())->open(Common::FSNode(getVolumeName((entry.volume))))) {
- stream.reset(nullptr);
- }
- }
+ if (_useSearchMan) {
+ stream.reset(SearchMan.createReadStreamForMember(getVolumeName((entry.volume))));
+ } else {
+ stream.reset(new Common::File());
+ if (!((Common::File *)stream.get())->open(Common::FSNode(getVolumeName((entry.volume))))) {
+ stream.reset(nullptr);
+ }
+ }
if (!stream) {
warning("Failed to open volume for file '%s'", name.c_str());
@@ -387,13 +387,13 @@ SeekableReadStream *InstallShieldCabinet::createReadStreamForMember(const Path &
// Then, iterate through the next volumes until we've read all the data for the file
while (bytesRead < entry.compressedSize) {
- if (_useSearchMan) {
- stream.reset(SearchMan.createReadStreamForMember(getVolumeName((++volume))));
- } else {
- if (!((Common::File *)stream.get())->open(Common::FSNode(getVolumeName((++volume))))) {
- stream.reset(nullptr);
- }
- }
+ if (_useSearchMan) {
+ stream.reset(SearchMan.createReadStreamForMember(getVolumeName((++volume))));
+ } else {
+ if (!((Common::File *)stream.get())->open(Common::FSNode(getVolumeName((++volume))))) {
+ stream.reset(nullptr);
+ }
+ }
if (!stream.get()) {
warning("Failed to read split file %s", name.c_str());
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index a0a28a72171..9e186944d2e 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -914,7 +914,7 @@ uint32 QuickTimeDecoder::VideoTrackHandler::getCurEditTrackDuration() const {
}
bool QuickTimeDecoder::VideoTrackHandler::atFirstEdit() const {
- return _curEdit == 0;
+ return _curEdit == 0;
}
bool QuickTimeDecoder::VideoTrackHandler::atLastEdit() const {
@@ -922,9 +922,9 @@ bool QuickTimeDecoder::VideoTrackHandler::atLastEdit() const {
}
bool QuickTimeDecoder::VideoTrackHandler::beforeCurEdit() const {
- // We're at the end of the edit once the next frame's time would
- // bring us past the end of the edit.
- return getRateAdjustedFrameTime() <= getCurEditTimeOffset();
+ // We're at the end of the edit once the next frame's time would
+ // bring us past the end of the edit.
+ return getRateAdjustedFrameTime() <= getCurEditTimeOffset();
}
bool QuickTimeDecoder::VideoTrackHandler::endOfCurEdit() const {
More information about the Scummvm-git-logs
mailing list