Merge remote-tracking branch 'ryzomcore/atys' into feature/code-to-root-atys

nel/include/nel/sound/driver/sound_driver.h

@@ -191,7 +191,7 @@ public:
 	/// Create a native music channel, only supported by the FMod driver.
 	virtual IMusicChannel *createMusicChannel() { return NULL; }
 	/** Get music info. Returns false if the song is not found or the function is not implemented.
-	 *  \param filepath path to file, CPath::lookup done by driver
+	 *  \param filepath full path to file
 	 *  \param artist returns the song artist (empty if not available)
 	 *  \param title returns the title (empty if not available)
 	 */

nel/src/misc/bitmap.cpp

@@ -3269,14 +3269,15 @@ CRGBAF CBitmap::getColor (float x, float y) const
 
 	uint32 i;
 
+	bool isValid = true;
 	for (i = 0; i < 4; ++i)
 	{
-		nlassert (nX[i] >= 0);
-		nlassert (nY[i] >= 0 );
-		nlassert (nX[i] < nWidth);
-		nlassert (nY[i] < nHeight);
+		if (nX[i] < 0 || nY[i] < 0 || nX[i] >= nWidth || nY[i] >= nHeight)
+			isValid = false;
 	}
 
+	if (isValid)
+	{
 		// Decimal part of (x,y)
 		x = x - (float)nX[0];
 		y = y - (float)nY[0];
@@ -3341,6 +3342,7 @@ CRGBAF CBitmap::getColor (float x, float y) const
 			break;
 			default: break;
 		}
+	}
 
 	return CRGBAF (0.0f, 0.0f, 0.0f, 0.0f);
 }

nel/src/sound/audio_decoder.cpp

@@ -110,10 +110,9 @@ IAudioDecoder *IAudioDecoder::createAudioDecoder(const std::string &type, NLMISC
 
 bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, std::string &title, float &length)
 {
-	std::string lookup = CPath::lookup(filepath, false);
-	if (lookup.empty())
+	if (filepath.empty() || !CFile::fileExists(filepath))
 	{
-		nlwarning("Music file %s does not exist!", filepath.c_str());
+		nlwarning("Music file '%s' does not exist!", filepath.c_str());
 		return false;
 	}
 
@@ -121,7 +120,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
 	CIFile ifile;
 	ifile.setCacheFileOnOpen(false);
 	ifile.allowBNPCacheFileOnOpen(false);
-	if (ifile.open(lookup))
+	if (ifile.open(filepath))
 		return CAudioDecoderFfmpeg::getInfo(&ifile, artist, title, length);
 #else
 	std::string type = CFile::getExtension(filepath);
@@ -132,7 +131,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
 		CIFile ifile;
 		ifile.setCacheFileOnOpen(false);
 		ifile.allowBNPCacheFileOnOpen(false);
-		if (ifile.open(lookup))
+		if (ifile.open(filepath))
 			return CAudioDecoderVorbis::getInfo(&ifile, artist, title, length);
 
 		nlwarning("Unable to open: '%s'", filepath.c_str());
@@ -143,7 +142,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
 		CIFile ifile;
 		ifile.setCacheFileOnOpen(false);
 		ifile.allowBNPCacheFileOnOpen(false);
-		if (ifile.open(lookup))
+		if (ifile.open(filepath))
 			return CAudioDecoderMP3::getInfo(&ifile, artist, title, length);
 
 		nlwarning("Unable to open: '%s'", filepath.c_str());

nel/src/sound/driver/fmod/sound_driver_fmod.cpp

@@ -496,36 +496,20 @@ bool getTag (std::string &result, const char *tag, FSOUND_STREAM *stream)
 }
 
 /** Get music info. Returns false if the song is not found or the function is not implemented. 
- *  \param filepath path to file, CPath::lookup done by driver
+ *  \param filepath full path to file
  *  \param artist returns the song artist (empty if not available)
  *  \param title returns the title (empty if not available)
  */
 bool CSoundDriverFMod::getMusicInfo(const std::string &filepath, std::string &artist, std::string &title, float &length)
 {
-	/* Open a stream, get the tag if it exists, close the stream */
-	string pathName = CPath::lookup(filepath, false);
-	uint32 fileOffset = 0, fileSize = 0;
-	if (pathName.empty())
+	if (filepath.empty() || !CFile::fileExists(filepath))
 	{
 		nlwarning("NLSOUND FMod Driver: Music file %s not found!", filepath.c_str());
 		return false;
 	}
-	// if the file is in a bnp
-	if (pathName.find('@') != string::npos)
-	{
-		if (CBigFile::getInstance().getFileInfo(pathName, fileSize, fileOffset))
-		{
-			// set pathname to bnp
-			pathName = pathName.substr(0, pathName.find('@'));			
-		}
-		else
-		{
-			nlwarning("NLSOUND FMod Driver: BNP BROKEN");
-			return false;
-		}
-	}
 
-	FSOUND_STREAM *stream = FSOUND_Stream_Open((const char *)CPath::lookup(filepath, false).c_str(), FSOUND_2D, (sint)fileOffset, (sint)fileSize);
+	uint32 fileOffset = 0, fileSize = 0;
+	FSOUND_STREAM *stream = FSOUND_Stream_Open(filepath.c_str(), FSOUND_2D, (sint)fileOffset, (sint)fileSize);
 	if (stream)
 	{
 		getTag(artist, "ARTIST", stream);

nel/src/sound/driver/fmod/sound_driver_fmod.h

@@ -112,7 +112,7 @@ public:
 	virtual IMusicChannel *createMusicChannel();
 	
 	/** Get music info. Returns false if the song is not found or the function is not implemented.
-	 *  \param filepath path to file, CPath::lookup done by driver
+	 *  \param filepath full path to file
 	 *  \param artist returns the song artist (empty if not available)
 	 *  \param title returns the title (empty if not available)
 	 */

ryzom/client/src/interface_v3/dbctrl_sheet.cpp

@@ -567,6 +567,11 @@ CDBCtrlSheet::~CDBCtrlSheet()
 			Driver->deleteTextureFile(_GuildSymb);
 		_GuildSymb = NULL;
 	}
+	if (_RegenText)
+	{
+		delete _RegenText;
+		_RegenText = NULL;
+	}
 
 	// ensure erase static
 	if(this==_CurrMenuSheet)		_CurrMenuSheet = NULL;

ryzom/client/src/interface_v3/interface_manager.cpp

@@ -1044,6 +1044,10 @@ void CInterfaceManager::initInGame()
 		gc->setTarget(gc->getSavedTarget());
 	}
 
+	// rebuild mp3 player playlist if user reselected a char (songs are already scanned)
+	CAHManager::getInstance()->runActionHandler("music_player", NULL, "update_playlist");
+	CAHManager::getInstance()->runActionHandler("music_player", NULL, "stop");
+
 	CCDBNodeLeaf *node = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHATLOG_STATE", false);
 	if (node)
 	{

ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp

@@ -2298,13 +2298,28 @@ int CLuaIHMRyzom::addShape(CLuaState &ls)
 
 	if(!instance.empty())
 	{
+
+		if (texture == "#season#" || texture.empty())
+		{
+			uint8 selectedTextureSet = (uint8)::computeCurrSeason();
+			instance.selectTextureSet(selectedTextureSet);
+			texture = "";
+		}
+		else if (texture[0] == '#')
+		{
+			uint8 selectedTextureSet;
+			fromString(texture.substr(1), selectedTextureSet);
+			instance.selectTextureSet(selectedTextureSet);
+			texture = "";
+		}
+
 		for(uint j=0;j<instance.getNumMaterials();j++)
 		{
 			if (!highlight)
 			{
-				instance.getMaterial(j).setAmbient(CRGBA(0,0,0,255));
+				/*instance.getMaterial(j).setAmbient(CRGBA(0,0,0,255));
 				instance.getMaterial(j).setEmissive(CRGBA(255,255,255,255));
-				instance.getMaterial(j).setShininess(10.0f);
+				instance.getMaterial(j).setShininess(10.0f);*/
 			}
 			else
 			{

ryzom/client/src/interface_v3/music_player.cpp

@@ -174,28 +174,30 @@ void CMusicPlayer::playSongs (const std::vector<std::string> &filenames)
 
 	// If pause, stop, else play will resume
 	if (_State == Paused || _Songs.empty())
-		_State = Stopped;
+		stop();
 
 	// get song title/duration using worker thread
 	MusicPlayerWorker.getSongsInfo(filenames);
 }
 
 // ***************************************************************************
-void CMusicPlayer::updatePlaylist(sint prevIndex)
+void CMusicPlayer::updatePlaylist(uint index, bool state)
 {
-	CInterfaceElement  *pIE;
-	std::string rowId;
+	if (index >= _Songs.size()) return;
+
+	std::string rowId = toString("%s:s%d:bg", MP3_PLAYER_PLAYLIST_LIST, index);
+	CInterfaceElement *pIE = dynamic_cast<CInterfaceElement*>(CWidgetManager::getInstance()->getElementFromId(rowId));
+	if (pIE) pIE->setActive(state);
+}
 
+void CMusicPlayer::updatePlaylist(sint prevIndex)
+{
 	if (prevIndex >= 0 && prevIndex < _Songs.size())
 	{
-		rowId = toString("%s:s%d:bg", MP3_PLAYER_PLAYLIST_LIST, prevIndex);
-		pIE = dynamic_cast<CInterfaceElement*>(CWidgetManager::getInstance()->getElementFromId(rowId));
-		if (pIE) pIE->setActive(false);
+		updatePlaylist(prevIndex, false);
 	}
 
-	rowId = toString("%s:s%d:bg", MP3_PLAYER_PLAYLIST_LIST, _CurrentSongIndex);
-	pIE = dynamic_cast<CInterfaceElement*>(CWidgetManager::getInstance()->getElementFromId(rowId));
-	if (pIE) pIE->setActive(true);
+	updatePlaylist(_CurrentSongIndex, true);
 }
 
 // ***************************************************************************
@@ -361,7 +363,7 @@ void CMusicPlayer::play (sint index)
 
 	if (_Songs.empty())
 	{
-		_State = Stopped;
+		stop();
 		return;
 	}
 
@@ -432,11 +434,15 @@ void CMusicPlayer::stop ()
 		return;
 
 	// stop the music only if we are really playing (else risk to stop a background music!)
+	if (_State != Stopped)
 		SoundMngr->stopMusic(0);
+
 	_State = Stopped;
 	_PlayStart = 0;
 	_PauseTime = 0;
 
+	clearPlayingInfo();
+
 	NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP:MP3_PLAYING")->setValueBool(false);
 }
 
@@ -472,12 +478,38 @@ void CMusicPlayer::next ()
 }
 
 // ***************************************************************************
+void CMusicPlayer::updatePlayingInfo(const std::string info)
+{
+	CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:mp3_player:screen:text"));
+	if (pVT)
+	{
+		pVT->setText(ucstring::makeFromUtf8(info));
+	}
+}
+
+// ***************************************************************************
+void CMusicPlayer::clearPlayingInfo()
+{
+	if (_Songs.empty())
+	{
+		updatePlayingInfo(CI18N::get("uiNoFiles").toUtf8());
+	}
+	else
+	{
+		updatePlayingInfo("");
+	}
+}
 
+// ***************************************************************************
 void CMusicPlayer::update ()
 {
 	if(!SoundMngr)
+	{
+		if (_State != Stopped)
 		{
 			_State = Stopped;
+			clearPlayingInfo();
+		}
 		return;
 	}
 
@@ -488,8 +520,6 @@ void CMusicPlayer::update ()
 
 	if (_State == Playing)
 	{
-		CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:mp3_player:screen:text"));
-		if (pVT)
 		{
 			TTime dur = (CTime::getLocalTime() - _PlayStart) / 1000;
 			uint min = (dur / 60) % 60;
@@ -499,7 +529,7 @@ void CMusicPlayer::update ()
 			std::string title(toString("%02d:%02d", min, sec));
 			if (hour > 0) title = toString("%02d:", hour) + title;
 			title += " " + _CurrentSong.Title;
-			pVT->setText(ucstring::makeFromUtf8(title));
+			updatePlayingInfo(title);
 		}
 
 		if (SoundMngr->isMusicEnded ())
@@ -520,8 +550,13 @@ void CMusicPlayer::update ()
 			}
 			else
 			{
-				SoundMngr->stopMusic(0);
-				_State = Stopped;
+				// remove active highlight from playlist
+				updatePlaylist(_CurrentSongIndex, false);
+
+				stop();
+
+				// restart from top on next 'play'
+				_CurrentSongIndex = 0;
 			}
 		}
 	}

ryzom/client/src/interface_v3/music_player.h

@@ -62,6 +62,10 @@ public:
 
 	void update ();
 
+	// update currently playing song info/duration on main gui
+	void updatePlayingInfo(const std::string info);
+	void clearPlayingInfo();
+
 	bool isRepeatEnabled() const;
 	bool isShuffleEnabled() const;
 
@@ -71,6 +75,8 @@ public:
 	void shuffleAndRebuildPlaylist();
 	// Update playlist active row
 	void updatePlaylist(sint prevIndex = -1);
+	// set/remove playlist highlight
+	void updatePlaylist(uint index, bool state);
 
 	// Update single song title/duration on _Songs and on playlist
 	void updateSong(const CSongs &song);

ryzom/client/src/release.cpp

@@ -240,8 +240,8 @@ void	releaseMainLoopReselect()
 	// alredy called from farTPMainLoop()
 	// --R2::getEditor().autoConfigRelease(IsInRingSession);
 
-	// Pause any user played music
-	MusicPlayer.pause();
+	// stop any user played music
+	MusicPlayer.stop();
 
 	// only really needed at exit
 	// --STRING_MANAGER::CStringManagerClient::instance()->flushStringCache();
@@ -390,8 +390,8 @@ void releaseMainLoop(bool closeConnection)
 	// Release R2 editor if applicable
 	R2::getEditor().autoConfigRelease(IsInRingSession);
 
-	// Pause any user played music
-	MusicPlayer.pause();
+	// stop any user played music
+	MusicPlayer.stop();
 
 	// flush the server string cache
 	STRING_MANAGER::CStringManagerClient::instance()->flushStringCache();