Merge

--HG--
branch : compatibility-develop

code/nel/include/nel/sound/audio_decoder_mp3.h

@@ -18,7 +18,7 @@
 #define NLSOUND_AUDIO_DECODER_MP3_H
 #include <nel/misc/types_nl.h>
 
-#if (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
+#if !defined(NL_OS_WINDOWS) || (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
 
 #include <nel/sound/audio_decoder.h>
 

code/nel/src/sound/audio_decoder.cpp

@@ -103,7 +103,7 @@ IAudioDecoder *IAudioDecoder::createAudioDecoder(const std::string &type, NLMISC
 	{
 		return new CAudioDecoderVorbis(stream, loop);
 	}
-#if (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
+#if !defined(NL_OS_WINDOWS) || (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
 	else if (type_lower == "mp3")
 	{
 		return new CAudioDecoderMP3(stream, loop);
@@ -146,7 +146,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
 
 		nlwarning("Unable to open: '%s'", filepath.c_str());
 	}
-#if (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
+#if !defined(NL_OS_WINDOWS) || (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
 	else if (type_lower == "mp3")
 	{
 		CIFile ifile;

code/nel/src/sound/audio_decoder_mp3.cpp

@@ -17,7 +17,7 @@
 
 #include "stdsound.h"
 
-#if (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
+#if !defined(NL_OS_WINDOWS) || (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
 
 #include <nel/sound/audio_decoder_mp3.h>
 

code/ryzom/client/client_default.cfg

@@ -352,6 +352,10 @@ SoundGameMusicVolume_min = 0.0;
 SoundGameMusicVolume_max = 1.0;
 SoundGameMusicVolume_step = 0.001;
 
+// MP3 player
+MediaPlayerDirectory = "music";
+MediaPlayerAutoPlay = false;
+
 // MISC
 PreDataPath = { "user", "patch", "data", "examples" };
 NeedComputeVS = 0;

code/ryzom/client/src/client_cfg.cpp

@@ -468,6 +468,10 @@ CClientConfig::CClientConfig()
 	ColorShout			= CRGBA(150,0,0,255);		// Default Shout color.
 	ColorTalk			= CRGBA(255,255,255,255);	// Default Talk color.
 
+	// MP3 player
+	MediaPlayerDirectory	= "music";
+	MediaPlayerAutoPlay		= false;
+
 //	PreDataPath.push_back("data/gamedev/language/");	// Default Path for the language data
 
 //	DataPath.push_back("data/");					// Default Path for the Data.
@@ -1243,6 +1247,10 @@ void CClientConfig::setValues()
 	// Max track
 	READ_INT_FV(MaxTrack)
 
+	// MP3 Player
+	READ_STRING_FV(MediaPlayerDirectory);
+	READ_BOOL_FV(MediaPlayerAutoPlay);
+
 	/////////////////
 	// USER COLORS //
 	// Shout Color

code/ryzom/client/src/client_cfg.h

@@ -366,6 +366,10 @@ struct CClientConfig
 	/// The max number of track we want to use.
 	uint			MaxTrack;
 
+	// MP3 Player
+	string			MediaPlayerDirectory;
+	bool			MediaPlayerAutoPlay;
+
 	/// Pre Data Path.
 	std::vector<string>			PreDataPath;
 	/// Data Path.

code/ryzom/client/src/interface_v3/music_player.cpp

@@ -23,6 +23,7 @@
 #include "../input.h"
 #include "../sound_manager.h"
 #include "interface_manager.h"
+#include "../client_cfg.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -43,8 +44,6 @@ extern UDriver	*Driver;
 #define MP3_SAVE_SHUFFLE "UI:SAVE:MP3_SHUFFLE"
 #define MP3_SAVE_REPEAT "UI:SAVE:MP3_REPEAT"
 
-static const std::string MediaPlayerDirectory("music/");
-
 CMusicPlayer MusicPlayer;
 
 // ***************************************************************************
@@ -396,7 +395,7 @@ public:
 
 			// Recursive scan for files from media directory
 			vector<string> filesToProcess;
-			string newPath = CPath::standardizePath(MediaPlayerDirectory);
+			string newPath = CPath::standardizePath(ClientCfg.MediaPlayerDirectory);
 			CPath::getPathContent (newPath, true, false, true, filesToProcess);
 
 			uint i;

code/ryzom/client/src/main_loop.cpp

@@ -1081,6 +1081,8 @@ bool mainLoop()
 
 	ProgressBar.finish();
 
+	bool musicTriggerAutoPlay = true;
+
 	// Main loop. If the window is no more Active -> Exit.
 	while( !UserEntity->permanentDeath()
 		&& !game_exit )
@@ -2418,6 +2420,17 @@ bool mainLoop()
 		// Update ingame duration and stat report sending
 		updateStatReport ();
 
+		// Auto play once on character login
+		if (musicTriggerAutoPlay)
+		{
+			musicTriggerAutoPlay = false;
+			if (ClientCfg.SoundOn && ClientCfg.MediaPlayerAutoPlay)
+			{
+				MusicPlayer.stop();
+				CAHManager::getInstance()->runActionHandler("music_player", NULL, "play_songs");
+				MusicPlayer.play();
+			}
+		}
 		// Update the music player
 		MusicPlayer.update ();
 
@@ -2453,6 +2466,9 @@ bool mainLoop()
 				// we have just completed init main loop, after reselecting character
 				//	repeat the steps before the main loop itself
 
+				// new char, retrigger music autoplay
+				musicTriggerAutoPlay = true;
+
 				// pre main loop in mainLoop
 				resetIngameTime ();