From d9ebd4fe7557dd0e123db52efcdc5790be5db710 Mon Sep 17 00:00:00 2001 From: Kevin Whitaker Date: Fri, 24 Feb 2017 17:02:29 -0500 Subject: [PATCH] limit tracks some more. Have track updated in title too. --- src/WebInterface.cpp | 3 +++ src/ui/RequestInterface.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/WebInterface.cpp b/src/WebInterface.cpp index a44a717..70c6e78 100644 --- a/src/WebInterface.cpp +++ b/src/WebInterface.cpp @@ -67,8 +67,10 @@ void WebInterface::loginCompleted() priv_int->loginUI->animateHide(Wt::WAnimation(Wt::WAnimation::AnimationEffect::Fade)); priv_int->playerUI->animateShow(Wt::WAnimation(Wt::WAnimation::AnimationEffect::Fade, Wt::WAnimation::TimingFunction::EaseIn, 500)); priv_int->playerUI->updateDetailsFromServer(GroovePlayerMgr::getInstance()->currentTrack); + setTitle("Arbitrateor - Audio Jukebox : ["+GroovePlayerMgr::getInstance()->currentTrack.trackName + "] " + GroovePlayerMgr::getInstance()->currentTrack.trackArtistName); priv_int->playerUI->updateVoteableTracksFromServer(GroovePlayerMgr::getInstance()->currentVoteBatch); priv_int->playerUI->updateVoteTrackState(); + if(currentUser.canUpload) priv_int->playerUI->mainDisplay->addTab(priv_int->playerUI->uploadPane, "Upload Track", Wt::WTabWidget::LazyLoading); if(currentUser.isAdmin) priv_int->playerUI->mainDisplay->addTab(priv_int->playerUI->adminPane, "Admin", Wt::WTabWidget::LazyLoading); } @@ -82,6 +84,7 @@ void WebInterface::playPauseActionFromServer(User userPausing, bool pause) void WebInterface::songChangedFromServer(AudioTrack nextTrack) { + setTitle("Arbitrateor - Audio Jukebox : ["+nextTrack.trackName + "] " + nextTrack.trackArtistName); priv_int->playerUI->updateDetailsFromServer(nextTrack); priv_int->playerUI->requestPane->updateRequestButtonState(); triggerUpdate(); diff --git a/src/ui/RequestInterface.cpp b/src/ui/RequestInterface.cpp index e84a2fb..d7409cc 100644 --- a/src/ui/RequestInterface.cpp +++ b/src/ui/RequestInterface.cpp @@ -140,7 +140,7 @@ void RequestInterface::searchClicked() } //Do a like search on title, artist, and album on DB - Wt::Dbo::collection> trackOptions = sqlSession.find(std::string("where tracks.name like \"%")+searchBox->text().toUTF8()+std::string("%\" OR tracks.artist like \"%")+searchBox->text().toUTF8()+std::string("%\" OR tracks.album like \"%")+searchBox->text().toUTF8()+std::string("%\"")).limit(49); + Wt::Dbo::collection> trackOptions = sqlSession.find(std::string("where tracks.name like \"%")+searchBox->text().toUTF8()+std::string("%\" OR tracks.artist like \"%")+searchBox->text().toUTF8()+std::string("%\" OR tracks.album like \"%")+searchBox->text().toUTF8()+std::string("%\"")).limit(30); //Make sure all items are gone for(RequestItem* item: foundItems) -- GitLab