owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UI/MOBILE] Began internal path support

Browse Source
This commit is contained in:
emeric
2016-03-05 11:34:59 +01:00
parent 6da1b42f93
commit a07704c218
22 changed files with 708 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/audio/mobile/MobileAudio.cpp
+49 -83
View File
@@ -17,8 +17,9 @@
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include <map>
#include <Wt/WContainerWidget>
#include <Wt/WStackedWidget>
#include <Wt/WTemplate>
#include <Wt/WText>
@@ -28,13 +29,29 @@
#include "audio/AudioPlayer.hpp"
#include "LmsApplication.hpp"
#include "ArtistSearchView.hpp"
#include "PreviewSearchView.hpp"
#include "ReleaseSearch.hpp"
#include "TrackSearch.hpp"
#include "ArtistView.hpp"
#include "ReleaseView.hpp"
#include "MobileAudio.hpp"
#define SEARCH_NB_ITEMS 4
namespace UserInterface {
namespace Mobile {
enum WidgetIdx
{
WidgetIdxSearchPreview = 0,
WidgetIdxSearchArtist = 1,
WidgetIdxSearchRelease = 2,
WidgetIdxSearchTrack = 3,
WidgetIdxArtist = 4,
WidgetIdxRelease = 5,
};
using namespace Database;
static void playTrack(AudioPlayer *audioPlayer, Database::Track::id_type trackId)
@@ -52,23 +69,9 @@ static void playTrack(AudioPlayer *audioPlayer, Database::Track::id_type trackId
void
Audio::search(std::string text)
{
// When a new search is done, output some results from:
// Artist
// Release
// Song
auto keywords = splitString(text, " ");;
_releaseSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Release, keywords), SEARCH_NB_ITEMS);
_artistSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Artist, keywords), SEARCH_NB_ITEMS);
_trackSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Track, keywords), SEARCH_NB_ITEMS);
_artistSearch->show();
_releaseSearch->show();
_trackSearch->show();
_trackReleaseView->hide();
wApp->setInternalPath("/audio/search/preview/" + stringToUTF8(text), true);
}
Audio::Audio(Wt::WContainerWidget *parent)
: UserInterface::Audio(parent)
{
@@ -76,12 +79,36 @@ Audio::Audio(Wt::WContainerWidget *parent)
this->setStyleClass("container-fluid");
this->setPadding(60, Wt::Bottom);
_artistSearch = new ArtistSearch(this);
_releaseSearch = new ReleaseSearch(this);
_trackSearch = new TrackSearch(this);
Wt::WStackedWidget *stack = new Wt::WStackedWidget(this);
_trackReleaseView = new TrackReleaseView(this);
_trackReleaseView->hide();
// Same order as WidgetIdxXXX
stack->addWidget(new PreviewSearchView());
stack->addWidget(new ArtistSearchView());
stack->addWidget(new ReleaseSearch());
stack->addWidget(new TrackSearch());
stack->addWidget(new ArtistView());
stack->addWidget(new ReleaseView());
wApp->internalPathChanged().connect(std::bind([=] (std::string path)
{
// order is important
static std::map<std::string, int> indexes =
{
{ "/audio/search/preview", WidgetIdxSearchPreview},
{ "/audio/search/artist", WidgetIdxSearchArtist},
{ "/audio/search/release", WidgetIdxSearchRelease},
{ "/audio/search/track", WidgetIdxSearchTrack},
{ "/audio/artist", WidgetIdxArtist},
{ "/audio/release", WidgetIdxRelease},
};
for (auto index : indexes)
{
if (wApp->internalPathMatches(index.first))
stack->setCurrentIndex(index.second);
}
}, std::placeholders::_1));
Wt::WTemplate* footer = new Wt::WTemplate(this);
footer->setTemplateText(Wt::WString::tr("mobile-audio-footer"));
@@ -89,67 +116,6 @@ Audio::Audio(Wt::WContainerWidget *parent)
AudioPlayer* audioPlayer = new AudioPlayer();
footer->bindWidget("player", audioPlayer);
_artistSearch->moreArtistsSelected().connect(std::bind([=]
{
_releaseSearch->hide();
_trackSearch->hide();
_artistSearch->show();
_trackReleaseView->hide();
}));
_artistSearch->artistSelected().connect(std::bind([=] (Artist::id_type artistId)
{
_artistSearch->hide();
_trackSearch->hide();
_releaseSearch->show();
_trackReleaseView->hide();
_releaseSearch->search(SearchFilter::ById(SearchFilter::Field::Artist, artistId), 20);
}, std::placeholders::_1));
_releaseSearch->moreReleasesSelected().connect(std::bind([=]
{
_artistSearch->hide();
_trackSearch->hide();
_releaseSearch->show();
_trackReleaseView->hide();
}));
_releaseSearch->releaseSelected().connect(std::bind([=] (Release::id_type releaseId)
{
_artistSearch->hide();
_releaseSearch->hide();
_trackSearch->hide();
_trackReleaseView->show();
_trackReleaseView->search(SearchFilter::ById(SearchFilter::Field::Release, releaseId), 40);
}, std::placeholders::_1));
_trackSearch->moreSelected().connect(std::bind([=]
{
_artistSearch->hide();
_releaseSearch->hide();
_trackSearch->show();
_trackReleaseView->hide();
}));
_trackSearch->trackPlay().connect(std::bind([=] (Track::id_type id)
{
playTrack(audioPlayer, id);
}, std::placeholders::_1));
_trackReleaseView->trackPlay().connect(std::bind([=] (Track::id_type id)
{
playTrack(audioPlayer, id);
}, std::placeholders::_1));
// Initially, populate the widgets using an empty search
{
_artistSearch->search(SearchFilter(), SEARCH_NB_ITEMS);
_releaseSearch->search(SearchFilter(), SEARCH_NB_ITEMS);
_trackSearch->search(SearchFilter(), SEARCH_NB_ITEMS);
}
}
} // namespace Mobile