Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make volume scale log

Browse Source
This commit is contained in:
stonedDiscord 2020-03-01 16:05:40 +01:00
parent d276f14766
commit b44338996b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/aomusicplayer.cpp
View File

@ -75,7 +75,7 @@ void AOMusicPlayer::play(QString p_song)
m_player.setMedia(QUrl::fromLocalFile(f_path)); m_player.setMedia(QUrl::fromLocalFile(f_path));
this->set_volume(m_volume); this->set_volume(100);
m_player.play(); m_player.play();
} }
@ -83,7 +83,12 @@ void AOMusicPlayer::play(QString p_song)
void AOMusicPlayer::set_volume(int p_value) void AOMusicPlayer::set_volume(int p_value)
{ {
m_volume = p_value; m_volume = p_value;
m_player.setVolume(m_volume);
qreal linearVolume = QAudio::convertVolume(m_volume / qreal(100),
QAudio::LogarithmicVolumeScale,
QAudio::LinearVolumeScale);
m_player.setVolume(linearVolume*100);
} }
QString AOMusicPlayer::get_path() QString AOMusicPlayer::get_path()
@ -93,7 +98,7 @@ QString AOMusicPlayer::get_path()
void AOMusicPlayer::kill_loop() void AOMusicPlayer::kill_loop()
{ {
// TODO QTAUDIO m_player.stop();
} }
#else #else
AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app): QObject() AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app): QObject()
@ -126,4 +131,4 @@ void AOMusicPlayer::kill_loop()
{ {
} }
#endif #endif