make volume scale log
This commit is contained in:
		
							parent
							
								
									d276f14766
								
							
						
					
					
						commit
						b44338996b
					
				@ -75,7 +75,7 @@ void AOMusicPlayer::play(QString p_song)
 | 
			
		||||
 | 
			
		||||
  m_player.setMedia(QUrl::fromLocalFile(f_path));
 | 
			
		||||
 | 
			
		||||
  this->set_volume(m_volume);
 | 
			
		||||
  this->set_volume(100);
 | 
			
		||||
 | 
			
		||||
  m_player.play();
 | 
			
		||||
}
 | 
			
		||||
@ -83,7 +83,12 @@ void AOMusicPlayer::play(QString p_song)
 | 
			
		||||
void AOMusicPlayer::set_volume(int 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()
 | 
			
		||||
@ -93,7 +98,7 @@ QString AOMusicPlayer::get_path()
 | 
			
		||||
 | 
			
		||||
void AOMusicPlayer::kill_loop()
 | 
			
		||||
{
 | 
			
		||||
    // TODO QTAUDIO
 | 
			
		||||
    m_player.stop();
 | 
			
		||||
}
 | 
			
		||||
#else
 | 
			
		||||
AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app): QObject()
 | 
			
		||||
@ -126,4 +131,4 @@ void AOMusicPlayer::kill_loop()
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user