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:
Nimetu 2016-08-30 21:27:56 +03:00
parent 5e712f3e02
commit 3610c6c8cb
10 changed files with 128 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/sound/audio_decoder.h
View file

@ -67,7 +67,7 @@ public:
static IAudioDecoder *createAudioDecoder(const std::string &type, NLMISC::IStream *stream, bool loop);
/// Get information on a music file (only artist and title at the moment).
static bool getInfo(const std::string &filepath, std::string &artist, std::string &title);
static bool getInfo(const std::string &filepath, std::string &artist, std::string &title, float &length);
/// Get audio/container extensions that are currently supported by the nel sound library.
static void getMusicExtensions(std::vector<std::string> &extensions);

2
code/nel/include/nel/sound/audio_decoder_vorbis.h
View file

@ -77,7 +77,7 @@ public:
inline sint32 getStreamOffset() { return _StreamOffset; }
/// Get information on a music file (only artist and title at the moment).
static bool getInfo(NLMISC::IStream *stream, std::string &artist, std::string &title);
static bool getInfo(NLMISC::IStream *stream, std::string &artist, std::string &title, float &length);
/// Get how many bytes the music buffer requires for output minimum.
virtual uint32 getRequiredBytes();

2
code/nel/include/nel/sound/audio_mixer_user.h
View file

@ -332,7 +332,7 @@ public:
virtual bool isMusicEnded();
virtual void setMusicVolume(float gain);
virtual float getMusicLength();
virtual bool getSongTitle(const std::string &filename, std::string &result);
virtual bool getSongTitle(const std::string &filename, std::string &result, float &length);
virtual void enableBackgroundMusic(bool enable);
virtual void enableBackgroundMusicTimeConstraint(bool enable);
CMusicSoundManager *getBackgroundMusicManager() const {return _BackgroundMusicManager;}

2
code/nel/include/nel/sound/u_audio_mixer.h
View file

@ -432,7 +432,7 @@ public:
/** Get the song title. Returns false if the song is not found or the function is not implemented.
* If the song as no name, result is filled with the filename.
*/
virtual bool getSongTitle(const std::string &filename, std::string &result) =0;
virtual bool getSongTitle(const std::string &filename, std::string &result, float &length) =0;
/** enable or disable the background music system. disable it when you want to play your own mp3 for instance
*/
virtual void enableBackgroundMusic(bool enable) =0;

4
code/nel/src/sound/audio_decoder.cpp
View file

@ -94,7 +94,7 @@ IAudioDecoder *IAudioDecoder::createAudioDecoder(const std::string &type, NLMISC
}
}
bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, std::string &title)
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())
@ -111,7 +111,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
ifile.setCacheFileOnOpen(false);
ifile.allowBNPCacheFileOnOpen(false);
if (ifile.open(lookup))
return CAudioDecoderVorbis::getInfo(&ifile, artist, title);
return CAudioDecoderVorbis::getInfo(&ifile, artist, title, length);
nlwarning("Unable to open: '%s'", filepath.c_str());
}

3
code/nel/src/sound/audio_decoder_vorbis.cpp
View file

@ -117,7 +117,7 @@ CAudioDecoderVorbis::~CAudioDecoderVorbis()
}
/// Get information on a music file (only artist and title at the moment).
bool CAudioDecoderVorbis::getInfo(NLMISC::IStream *stream, std::string &artist, std::string &title)
bool CAudioDecoderVorbis::getInfo(NLMISC::IStream *stream, std::string &artist, std::string &title, float &length)
{
CAudioDecoderVorbis mbv(stream, false); // just opens and closes the oggvorbisfile thing :)
vorbis_comment *vc = ov_comment(&mbv._OggVorbisFile, -1);
@ -125,6 +125,7 @@ bool CAudioDecoderVorbis::getInfo(NLMISC::IStream *stream, std::string &artist,
if (title_c) title = title_c; else title.clear();
char *artist_c = vorbis_comment_query(vc, "artist", 0);
if (artist_c) artist = artist_c; else artist.clear();
length = (float)ov_time_total(&mbv._OggVorbisFile, -1);
return true;
}

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

@ -2684,7 +2684,7 @@ float CAudioMixerUser::getMusicLength()
}
// ***************************************************************************
bool CAudioMixerUser::getSongTitle(const std::string &filename, std::string &result)
bool CAudioMixerUser::getSongTitle(const std::string &filename, std::string &result, float &length)
{
if (_SoundDriver)
{
@ -2694,7 +2694,7 @@ bool CAudioMixerUser::getSongTitle(const std::string &filename, std::string &res
if (!_SoundDriver->getMusicInfo(filename, artist, title))
{
// use 3rd party libraries supported formats
IAudioDecoder::getInfo(filename, artist, title);
IAudioDecoder::getInfo(filename, artist, title, length);
}
if (!title.empty())
@ -2715,6 +2715,7 @@ bool CAudioMixerUser::getSongTitle(const std::string &filename, std::string &res
}
result = "???";
length = 0;
return false;
}

58
code/ryzom/client/data/gamedev/interfaces_v3/compass.xml
View file

@ -25,23 +25,38 @@
<group type="menu"
id="mp3_player_menu"
extends="base_menu_with_color"></group>
<template name="playlist_song" keep="true" id="" posparent="parent" posref="TL TL" w="206" h="20" line_maxw="160" index="0">
<group id="#id" w="#w" child_resize_h="true" posparent="#posparent" posref="#posref" group_onclick_r="" group_params_r="">
<ctrl type="button" id="btn" button_type="toggle_button" sizeref="wh" tx_normal="blank.tga" tx_pushed="blank.tga" tx_over="blank.tga" scale="true"
color="255 255 255 0" col_pushed="255 255 255 0" col_over="255 255 255 90"
global_color_normal="true" global_color_pushed="true" global_color_over="true"
ondblclick_l="music_player" params_dblclick_l="song=#index" />
<view type="text" id="title" posref="ML ML" x="0" line_maxw="#line_maxw" fontsize="8" shadow="true" multi_line="true" multi_line_space="0" />
<view type="text" id="duration" posref="MR MR" x="0" fontsize="8" shadow="true" color="255 255 255 128" />
</group>
</template>
<group type="modal"
id="playlist"
posparent="mp3_player"
posref="BM TM"
w="234"
h="256"
max_h="250"
child_resize_h="true"
child_resize_hmargin="10"
options="layer0"
mouse_pos="false"
escapable="false"
exit_click_out="false"
escapable="true"
exit_click_out="true"
on_active=""
on_active_params="">
<view type="text"
id="title"
posref="TL TL"
x="4"
y="-4"
x="8"
y="-8"
hardtext="uiPlaylistTitle"
shadow="true"
color="255 255 255 255"
@ -50,14 +65,33 @@
id="close"
button_type="push_button"
posref="TR TR"
x="-4"
y="-4"
x="-8"
y="-8"
tx_normal="w_win_close.tga"
tx_pushed="w_win_close.tga"
tx_over="W_button_14_over.tga"
onclick_l="leave_modal"
params_l="" />
<ctrl style="text_button_header"
button_type="push_button"
id="refresh"
posparent="close"
posref="ML MR"
x="-4"
y="0"
hardtext="uiPlaylistRefresh"
onclick_l="music_player"
params_l="play_songs" />
<group id="content" x="8" y="-24" over="true" sizeref="w" posref="TL TL" child_resize_h="true" child_resize_hmargin="4">
<group id="songs" x="10" y="0" sizeref="w" posref="TL TL" child_resize_h="true" max_h="215">
<group id="list" type="list" x="0" y="0" posref="TL TL" />
</group>
<ctrl style="skin_scroll" id="sv" posref="TL TL" target="songs" />
</group>
</group>
<tree node="playlist" />
<link expr="@UI:SAVE:MP3_VOLUME"
action="music_player"
params="volume=@UI:SAVE:MP3_VOLUME" />
@ -223,12 +257,12 @@
button_type="push_button"
posref="MM MM"
posparent="slot5"
tx_normal="mp3_button_open.tga"
tx_pushed="mp3_button_open.tga"
tx_normal="mp3_button_list.tga"
tx_pushed="mp3_button_list.tga"
tx_over="mp3_button_over.tga"
onclick_l="music_player"
params_l="play_songs"
tooltip="uiMP3Open" />
onclick_l="enter_modal"
params_l="group=ui:interface:playlist"
tooltip="uiMP3Playlist" />
<!--
<ctrl type="button" id="but_list" button_type="push_button" posref="MM MM" posparent="slot6"
tx_normal="mp3_button_list.tga" tx_pushed="mp3_button_list.tga" tx_over="mp3_button_over.tga"

73
code/ryzom/client/src/interface_v3/music_player.cpp
View file

@ -34,6 +34,12 @@ using namespace NL3D;
extern UDriver *Driver;
// xml element ids
#define MP3_PLAYER_PLAYLIST_LIST "ui:interface:playlist:content:songs:list"
#define TEMPLATE_PLAYLIST_SONG "playlist_song"
#define TEMPLATE_PLAYLIST_SONG_TITLE "title"
#define TEMPLATE_PLAYLIST_SONG_DURATION "duration"
static const std::string MediaPlayerDirectory("music/");
CMusicPlayer MusicPlayer;
@ -48,27 +54,76 @@ CMusicPlayer::CMusicPlayer ()
// ***************************************************************************
void CMusicPlayer::playSongs (const std::vector<CSongs> &songs)
{
_Songs = songs;
// reset song index if out of bounds
if (_CurrentSong > _Songs.size())
_CurrentSong = 0;
CGroupList *pList = dynamic_cast<CGroupList *>(CWidgetManager::getInstance()->getElementFromId(MP3_PLAYER_PLAYLIST_LIST));
if (pList)
{
pList->clearGroups();
pList->setDynamicDisplaySize(true);
for (uint i=0; i < _Songs.size(); ++i)
{
uint min = (sint32)(_Songs[i].Length / 60) % 60;
uint sec = (sint32)(_Songs[i].Length) % 60;
uint hour = _Songs[i].Length / 3600;
std::string duration(toString("%02d:%02d", min, sec));
if (hour > 0)
duration = toString("%02d:", hour) + duration;
vector< pair<string, string> > vParams;
vParams.push_back(pair<string, string>("id", "s" + toString(i)));
vParams.push_back(pair<string, string>("index", toString(i)));
CInterfaceGroup *pNew = CWidgetManager::getInstance()->getParser()->createGroupInstance(TEMPLATE_PLAYLIST_SONG, pList->getId(), vParams);
if (pNew)
{
CViewText *pVT = dynamic_cast<CViewText *>(pNew->getView(TEMPLATE_PLAYLIST_SONG_TITLE));
if (pVT)
{
ucstring title;
title.fromUtf8(_Songs[i].Title);
pVT->setText(title);
}
pVT = dynamic_cast<CViewText *>(pNew->getView(TEMPLATE_PLAYLIST_SONG_DURATION));
if (pVT)
{
pVT->setText(duration);
}
pNew->setParent(pList);
pList->addChild(pNew);
}
}
pList->invalidateCoords();
}
// If pause, stop, else play will resume
if (_State == Paused)
_State = Stopped;
play ();
}
// ***************************************************************************
void CMusicPlayer::play ()
void CMusicPlayer::play (sint index)
{
if(!SoundMngr)
return;
if (index >= 0 && index < _Songs.size())
{
if (_State == Paused)
stop();
_CurrentSong = index;
}
if (!_Songs.empty())
{
nlassert (_CurrentSong<_Songs.size());
@ -300,7 +355,7 @@ public:
CMusicPlayer::CSongs song;
song.Filename = filenames[i];
SoundMngr->getMixer()->getSongTitle(filenames[i], song.Title);
SoundMngr->getMixer()->getSongTitle(filenames[i], song.Title, song.Length);
songs.push_back (song);
}
@ -330,6 +385,14 @@ public:
}
}
}
string song = getParam(Params, "song");
if (!song.empty())
{
sint index=0;
fromString(song, index);
MusicPlayer.play(index);
}
}
}
};

3
code/ryzom/client/src/interface_v3/music_player.h
View file

@ -41,10 +41,11 @@ public:
public:
std::string Filename;
std::string Title;
float Length;
};
void playSongs (const std::vector<CSongs> &songs);
void play (); // Play the song at current position, if playing, restart. If paused, resume.
void play (sint index = -1); // Play the song at current position, if playing, restart. If paused, resume.
void pause ();
void stop ();
void previous ();