diff options
Diffstat (limited to 'src/aomusicplayer.cpp')
| -rw-r--r-- | src/aomusicplayer.cpp | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/src/aomusicplayer.cpp b/src/aomusicplayer.cpp index 59cf4d23..2cac91dd 100644 --- a/src/aomusicplayer.cpp +++ b/src/aomusicplayer.cpp @@ -56,7 +56,7 @@ QString AOMusicPlayer::play(QString p_song, int channel, bool loop, QString d_path = f_path + ".txt"; loop_start[channel] = 0; - loop_end[channel] = BASS_ChannelGetLength(newstream, BASS_POS_BYTE); + loop_end[channel] = 0; if (loop && file_exists(d_path)) // Contains loop/etc. information file { QStringList lines = ao_app->read_file(d_path).split("\n"); @@ -76,7 +76,7 @@ QString AOMusicPlayer::play(QString p_song, int channel, bool loop, int num_channels = 2; // Calculate the bytes for loop_start/loop_end to use with the sync proc - QWORD bytes = static_cast<QWORD>(args[1].trimmed().toFloat() * + QWORD bytes = static_cast<QWORD>(args[1].trimmed().toUInt() * sample_size * num_channels); if (arg == "loop_start") loop_start[channel] = bytes; @@ -87,7 +87,7 @@ QString AOMusicPlayer::play(QString p_song, int channel, bool loop, } qDebug() << "Found data file for song" << p_song << "length" << BASS_ChannelGetLength(newstream, BASS_POS_BYTE) << "loop start" - << loop_start << "loop end" << loop_end; + << loop_start[channel] << "loop end" << loop_end[channel]; } if (BASS_ChannelIsActive(m_stream_list[channel]) == BASS_ACTIVE_PLAYING) { @@ -194,33 +194,39 @@ void CALLBACK loopProc(HSYNC handle, DWORD channel, DWORD data, void *user) BASS_ChannelLock(channel, false); } -void AOMusicPlayer::set_looping(bool toggle, int channel) +void AOMusicPlayer::set_looping(bool loop_song, int channel) { - m_looping = toggle; - if (!m_looping) { + if (!loop_song) { if (BASS_ChannelFlags(m_stream_list[channel], 0, 0) & BASS_SAMPLE_LOOP) BASS_ChannelFlags(m_stream_list[channel], 0, BASS_SAMPLE_LOOP); // remove the LOOP flag BASS_ChannelRemoveSync(m_stream_list[channel], loop_sync[channel]); loop_sync[channel] = 0; + return; } - else { - BASS_ChannelFlags(m_stream_list[channel], BASS_SAMPLE_LOOP, - BASS_SAMPLE_LOOP); // set the LOOP flag - if (loop_sync[channel] != 0) { - BASS_ChannelRemoveSync(m_stream_list[channel], - loop_sync[channel]); // remove the sync - loop_sync[channel] = 0; + + BASS_ChannelFlags(m_stream_list[channel], BASS_SAMPLE_LOOP, + BASS_SAMPLE_LOOP); // set the LOOP flag + if (loop_sync[channel] != 0) { + BASS_ChannelRemoveSync(m_stream_list[channel], + loop_sync[channel]); // remove the sync + loop_sync[channel] = 0; + } + + if (loop_start[channel] > 0) { + if (loop_end[channel] > 0 && (loop_end[channel] > loop_start[channel])) + { + //Loop when the endpoint is reached. + loop_sync[channel] = BASS_ChannelSetSync( + m_stream_list[channel], BASS_SYNC_END | BASS_SYNC_MIXTIME, + loop_end[channel] , loopProc, &loop_start[channel]); } - if (loop_start[channel] > 0) { - if (loop_end[channel] == 0) - loop_end[channel] = - BASS_ChannelGetLength(m_stream_list[channel], BASS_POS_BYTE); - if (loop_end[channel] > - 0) // Don't loop zero length songs even if we're asked to - loop_sync[channel] = BASS_ChannelSetSync( - m_stream_list[channel], BASS_SYNC_POS | BASS_SYNC_MIXTIME, - loop_end[channel], loopProc, &loop_start[channel]); + else + { + //Loop when the end of the file is reached. + loop_sync[channel] = BASS_ChannelSetSync( + m_stream_list[channel], BASS_SYNC_POS | BASS_SYNC_MIXTIME, + 0 , loopProc, &loop_start[channel]); } } } |