Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(nw) hopefully fixed cassette bugs from my commit of 6 months ago

Browse Source
This commit is contained in:
Robbbert 2020-01-07 00:29:38 +11:00
parent 5ef3d3a3b5
commit 9b7859db96
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/devices/imagedev/cassette.cpp
View File

@ -124,10 +124,17 @@ void cassette_image_device::update()
void cassette_image_device::change_state(cassette_state state, cassette_state mask)
{
cassette_state new_state = (m_state & ~mask) | (state & mask);
if ((m_state ^ new_state) & (CASSETTE_MASK_UISTATE | CASSETTE_MASK_MOTOR))
m_position_time = machine().time().as_double();
m_state = new_state;
cassette_state new_state;
new_state = m_state;
new_state &= ~mask;
new_state |= (state & mask);
if (new_state != m_state)
{
update();
m_state = new_state;
}
}
@ -136,7 +143,7 @@ double cassette_image_device::input()
{
update();
int32_t sample = m_value;
double double_value = sample / double(0x7FFFFFFF);
double double_value = sample / (double(0x7FFFFFFF));
LOGMASKED(LOG_DETAIL, "cassette_input(): time_index=%g value=%g\n", m_position, double_value);
@ -154,14 +161,18 @@ void cassette_image_device::output(double value)
value = std::min(value, 1.0);
value = std::max(value, -1.0);
m_value = (int32_t) (value * 0x7FFFFFFF);
m_value = int32_t(value * 0x7FFFFFFF);
}
}
double cassette_image_device::get_position()
{
return m_position;
double position = m_position;
if (is_motor_on())
position += (machine().time().as_double() - m_position_time)*m_speed*m_direction;
return position;
}
@ -197,6 +208,8 @@ void cassette_image_device::go_reverse()
void cassette_image_device::seek(double time, int origin)
{
update();
double length = get_length();
switch(origin) {
@ -290,8 +303,7 @@ image_init_result cassette_image_device::internal_load(bool is_create)
}
/* set to default state, but only change the UI state */
//change_state(m_default_state, CASSETTE_MASK_UISTATE);
m_state = m_default_state;
change_state(m_default_state, CASSETTE_MASK_UISTATE);
/* reset the position */
m_position = 0.0;
@ -374,7 +386,7 @@ std::string cassette_image_device::call_display()
? u8"\u25BA"
: u8"\u25CF";
// Since you can have anything in a BDF file, we will use crude ascii characters instead
// create information string
result = string_format("%s %s %02d:%02d (%04d) [%02d:%02d (%04d)]",
shapes[n], // animation
status_icon, // play or record
@ -384,6 +396,18 @@ std::string cassette_image_device::call_display()
((int)length / 60),
((int)length % 60),
(int)length);
// make sure tape stops at end when playing
if ((m_state & CASSETTE_MASK_UISTATE) == CASSETTE_PLAY)
{
if (m_cassette)
{
if (get_position() > get_length())
{
m_state = ((m_state & ~CASSETTE_MASK_UISTATE) | CASSETTE_STOPPED);
}
}
}
}
return result;
}
@ -400,7 +424,7 @@ void cassette_image_device::sound_stream_update(sound_stream &stream, stream_sam
if (m_stereo)
right_buffer = outputs[1];
cassette_state state = get_state();
cassette_state state = get_state() & (CASSETTE_MASK_UISTATE | CASSETTE_MASK_MOTOR | CASSETTE_MASK_SPEAKER);
if (exists() && (state == (CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)))
{