Xargon/org.mamedev.MAME
1
0
Fork 0
mirror of https://github.com/RetroDECK/org.mamedev.MAME.git synced 2025-01-19 11:05:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #42 from flathub/0.262

Browse source 
Sync 0.262
This commit is contained in:
jflatt 2024-01-31 10:18:53 -08:00 committed by GitHub
parent 37f546b59a 1500135141
commit 3455feac62
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
floppy.patch
View file

@ -1,40 +1,40 @@
diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp
index 3c00336d..cda94d92 100644 index b0a520a0..7f733635 100644
--- a/src/devices/imagedev/floppy.cpp --- a/src/devices/imagedev/floppy.cpp
+++ b/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp
@@ -1707,9 +1707,10 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, std::vector< @@ -1709,9 +1709,11 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, std::vector<
{ {
idx = m_spin_playback_sample; m_idx = m_spin_playback_sample;
sampleend = m_sample[idx].data.size(); sampleend = m_sample[m_idx].data.size();
- out = m_sample[idx].data[m_spin_samplepos++]; - out = m_sample[m_idx].data[m_spin_samplepos++];
-
- if (m_spin_samplepos >= sampleend) - if (m_spin_samplepos >= sampleend)
+ m_spin_samplepos++; + m_spin_samplepos++;
+ if (m_spin_samplepos < sampleend) + if (m_spin_samplepos < sampleend)
+ out = m_sample[idx].data[m_spin_samplepos]; + out = m_sample[m_idx].data[m_spin_samplepos];
+ else + else
{ {
// Motor sample has completed // Motor sample has completed
switch (m_spin_playback_sample) switch (m_spin_playback_sample)
@@ -1763,7 +1764,8 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, std::vector< @@ -1765,7 +1767,8 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, std::vector<
idx = m_step_base + m_seek_playback_sample; m_idx = m_step_base + m_seek_playback_sample;
sampleend = m_sample[idx].data.size(); sampleend = m_sample[m_idx].data.size();
// Mix it into the stream value // Mix it into the stream value
- out += m_sample[idx].data[(int)m_seek_samplepos]; - out += m_sample[m_idx].data[(int)m_seek_samplepos];
+ if (m_seek_samplepos < sampleend) + if (m_seek_samplepos < sampleend)
+ out += m_sample[idx].data[(int)m_seek_samplepos]; + out += m_sample[m_idx].data[(int)m_seek_samplepos];
// By adding different values than 1, we can change the playback speed // By adding different values than 1, we can change the playback speed
// This will be used to adjust the seek sound // This will be used to adjust the seek sound
m_seek_samplepos += m_seek_pitch; m_seek_samplepos += m_seek_pitch;
@@ -1781,8 +1783,10 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, std::vector< @@ -1783,8 +1786,10 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, std::vector<
sampleend = m_sample[idx].data.size(); sampleend = m_sample[m_idx].data.size();
// Mix it into the stream value // Mix it into the stream value
- out += m_sample[idx].data[m_step_samplepos++]; - out += m_sample[m_idx].data[m_step_samplepos++];
- if (m_step_samplepos >= sampleend) - if (m_step_samplepos >= sampleend)
+ m_step_samplepos++; + m_step_samplepos++;
+ if (m_step_samplepos < sampleend) + if (m_step_samplepos < sampleend)
+ out += m_sample[idx].data[m_step_samplepos]; + out += m_sample[m_idx].data[m_step_samplepos];
+ else + else
{ {
// Step sample done // Step sample done

2
org.mamedev.MAME.metainfo.xml
View file

@ -7,6 +7,7 @@
<summary> <summary>
MAME is a multi-purpose emulation framework. MAME is a multi-purpose emulation framework.
</summary> </summary>
<developer_name>MAMEDev and contributors</developer_name>
<description> <description>
<p> <p>
MAME&apos;s purpose is to preserve decades of software history. As electronic technology continues to rush MAME&apos;s purpose is to preserve decades of software history. As electronic technology continues to rush
@ -27,6 +28,7 @@
<url type="homepage">https://www.mamedev.org</url> <url type="homepage">https://www.mamedev.org</url>
<launchable type="desktop-id">org.mamedev.MAME.desktop</launchable> <launchable type="desktop-id">org.mamedev.MAME.desktop</launchable>
<releases> <releases>
<release version="0.262" date="2024-01-31"/>
<release version="0.261" date="2023-11-29"/> <release version="0.261" date="2023-11-29"/>
<release version="0.260" date="2023-10-25"/> <release version="0.260" date="2023-10-25"/>
<release version="0.259" date="2023-09-29"/> <release version="0.259" date="2023-09-29"/>

4
org.mamedev.MAME.yaml
View file

@ -59,8 +59,8 @@ modules:
- cp -r samples/ ${FLATPAK_DEST}/share/mame/ - cp -r samples/ ${FLATPAK_DEST}/share/mame/
sources: sources:
- type: archive - type: archive
url: https://github.com/mamedev/mame/archive/refs/tags/mame0261.tar.gz url: https://github.com/mamedev/mame/archive/refs/tags/mame0262.tar.gz
sha256: 51d5ce1563897709ceb7a924c31a70cc5ff2bec466aab8d0cc9ff3cc72b38899 sha256: 64e482f3dd13be4e91c5dfa076fb7a71f450f2879118c6ae452b0037b661aaae
- type: file - type: file
path: mame16x16.png path: mame16x16.png
- type: file - type: file