Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-09-03 10:15:39 +02:00
parent 1b139b7dfa
commit 8c0af53b48
9 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/sound/driver/sound_driver.h
View file

@ -192,7 +192,7 @@ public:
* \param artist returns the song artist (empty if not available)
* \param title returns the title (empty if not available)
*/
virtual bool getMusicInfo(const std::string &/* filepath */, std::string &artist, std::string &title) { artist.clear(); title.clear(); return false; }
virtual bool getMusicInfo(const std::string &/* filepath */, std::string &artist, std::string &title, float &length) { artist.clear(); title.clear(); length = 0.f; return false; }
/// Get audio/container extensions that are supported natively by the driver implementation.
virtual void getMusicExtensions(std::vector<std::string> &extensions) const = 0;
/// Return if a music extension is supported by the driver's music channel.

1
code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
View file

@ -1685,6 +1685,7 @@ void registerGlExtensions(CGlExtensions &ext)
{
ext.ARBFragmentProgram = false;
ext.NVFragmentProgram2 = false;
ext.ARBFragmentShader = false;
}
ext.OESDrawTexture = setupOESDrawTexture(glext);

2
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -1486,7 +1486,7 @@ bool CDriverGL::createWindow(const GfxMode &mode)
[[CocoaApplicationDelegate alloc] initWithDriver:this];
// set the application delegate, this will handle window/app close events
[NSApp setDelegate:(id<NSFileManagerDelegate>)appDelegate];
[NSApp setDelegate:(id<NSApplicationDelegate>)appDelegate];
// bind the close button of the window to applicationShouldTerminate
id closeButton = [cocoa_window standardWindowButton:NSWindowCloseButton];

2
code/nel/src/sound/audio_mixer_user.cpp
View file

@ -2691,7 +2691,7 @@ bool CAudioMixerUser::getSongTitle(const std::string &filename, std::string &res
std::string artist;
std::string title;
if (!_SoundDriver->getMusicInfo(filename, artist, title))
if (!_SoundDriver->getMusicInfo(filename, artist, title, length))
{
// use 3rd party libraries supported formats
IAudioDecoder::getInfo(filename, artist, title, length);

2
code/nel/src/sound/driver/dsound/sound_driver_dsound.h
View file

@ -115,7 +115,7 @@ public:
* \param artist returns the song artist (empty if not available)
* \param title returns the title (empty if not available)
*/
virtual bool getMusicInfo(const std::string & /* filepath */, std::string &artist, std::string &title) { artist.clear(); title.clear(); return false; }
virtual bool getMusicInfo(const std::string & /* filepath */, std::string &artist, std::string &title, float &length) { artist.clear(); title.clear(); length = 0.f; return false; }
private:

4
code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
View file

@ -496,7 +496,7 @@ bool getTag (std::string &result, const char *tag, FSOUND_STREAM *stream)
* \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)
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);
@ -526,6 +526,8 @@ bool CSoundDriverFMod::getMusicInfo(const std::string &filepath, std::string &ar
{
getTag(artist, "ARTIST", stream);
getTag(title, "TITLE", stream);
// get length of the music in seconds
length = (float)FSOUND_Stream_GetLengthMs(stream) / 1000.f;
FSOUND_Stream_Close(stream);
return true;
}

2
code/nel/src/sound/driver/fmod/sound_driver_fmod.h
View file

@ -116,7 +116,7 @@ public:
* \param artist returns the song artist (empty if not available)
* \param title returns the title (empty if not available)
*/
virtual bool getMusicInfo(const std::string &filepath, std::string &artist, std::string &title);
virtual bool getMusicInfo(const std::string &filepath, std::string &artist, std::string &title, float &length);
// also check that the channel still exist (avoid any free problem)
void markMusicChannelEnded(void *stream, CMusicChannelFMod *musicChannel);

6
code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
View file

@ -679,12 +679,12 @@ bool CConfigFile::foundTemporaryFiles(const QString &directory) const
// directory doesn't exist
if (!dir.exists()) return false;
if (!dir.cd("data") && dir.exists()) return false;
if (!dir.cd("data")) return false;
QStringList filter;
filter << "*.string_cache";
if (dir.exists("packed_sheets.bnp"))
if (dir.exists("packedsheets.bnp"))
{
filter << "*.packed_sheets";
filter << "*.packed";
@ -695,7 +695,7 @@ bool CConfigFile::foundTemporaryFiles(const QString &directory) const
if (!dir.entryList(filter, QDir::Files).isEmpty()) return true;
// fonts directory is not needed anymore
if (dir.exists("fonts.bnp") && dir.cd("fonts") && dir.exists()) return true;
if (dir.exists("fonts.bnp") && !dir.cd("fonts")) return true;
return false;
}

4
code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp
View file

@ -46,7 +46,7 @@ bool CFilesCleaner::exec()
// directory doesn't exist
if (!dir.exists()) return false;
if (!dir.cd("data") && dir.exists()) return false;
if (!dir.cd("data")) return false;
QStringList filter;
filter << "*.string_cache";
@ -79,7 +79,7 @@ bool CFilesCleaner::exec()
}
// fonts directory is not needed anymore if fonts.bnp exists
if (dir.exists("fonts.bnp") && dir.cd("fonts") && dir.exists())
if (dir.exists("fonts.bnp") && dir.cd("fonts"))
{
dir.removeRecursively();
}