[Ultrastar-ng-cvs] UltraStar-ng/src audio.cpp, 1.25, 1.26 configuration.cpp, 1.4, 1.5

[Yoda-JM <yo...@us...>]

Update of /cvsroot/ultrastar-ng/UltraStar-ng/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27996/src

Modified Files:
	audio.cpp configuration.cpp 
Log Message:
Added volume control


Index: audio.cpp
===================================================================
RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/audio.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** audio.cpp	16 Apr 2007 21:19:51 -0000	1.25
--- audio.cpp	8 Jun 2007 20:33:52 -0000	1.26
***************
*** 54,57 ****
--- 54,77 ----
  }
  
+ unsigned int CAudio::getVolume()
+ {
+ #ifdef USE_LIBXINE_AUDIO
+ 	return xine_get_param( stream, XINE_PARAM_AUDIO_VOLUME );
+ #endif
+ #ifdef USE_GSTREAMER_AUDIO
+ 	return 100;
+ #endif
+ }
+ 
+ void CAudio::setVolume( unsigned int _volume )
+ {
+ #ifdef USE_LIBXINE_AUDIO
+ 	xine_set_param( stream, XINE_PARAM_AUDIO_VOLUME, _volume );
+ #endif
+ #ifdef USE_GSTREAMER_AUDIO
+ 	_volume = _volume;
+ #endif
+ }
+ 
  void CAudio::playMusic( char * filename )
  {

Index: configuration.cpp
===================================================================
RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/configuration.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configuration.cpp	5 Jun 2007 11:31:09 -0000	1.4
--- configuration.cpp	8 Jun 2007 20:33:52 -0000	1.5
***************
*** 96,97 ****
--- 96,137 ----
  	sm->setDifficulty(difficulty);
  }
+ 
+ /****************************************************************************/
+ 
+ CConfigurationAudioVolume::CConfigurationAudioVolume()
+ {
+ 	CScreenManager * sm = CScreenManager::getSingletonPtr();
+ 	audioVolume = sm->getAudio()->getVolume();
+ 	description="Audio Volume";
+ }
+ CConfigurationAudioVolume::~CConfigurationAudioVolume()
+ {
+ }
+ bool CConfigurationAudioVolume::isLast()
+ {
+ 	return (audioVolume>=100);
+ }
+ bool CConfigurationAudioVolume::isFirst()
+ {
+ 	return (audioVolume<=0);
+ }
+ void CConfigurationAudioVolume::setNext()
+ {
+ 	audioVolume++;
+ 	apply();
+ }
+ void CConfigurationAudioVolume::setPrevious()
+ {
+ 	audioVolume--;
+ 	apply();
+ }
+ char * CConfigurationAudioVolume::getValue()
+ {
+ 	sprintf(value,"%d%%",audioVolume);
+ 	return value;
+ }
+ void CConfigurationAudioVolume::apply()
+ {
+ 	CScreenManager * sm = CScreenManager::getSingletonPtr();
+ 	sm->getAudio()->setVolume(audioVolume);
+ }