eyecreate/Arbitrateor
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

limit tracks some more. Have track updated in title too.

Browse Source
This commit is contained in:
Kevin Whitaker
2017-02-24 17:02:29 -05:00
parent 4e34ce5d21
commit d9ebd4fe75
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/WebInterface.cpp
View File

@@ -67,8 +67,10 @@ void WebInterface::loginCompleted()
priv_int->loginUI->animateHide(Wt::WAnimation(Wt::WAnimation::AnimationEffect::Fade)); 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->animateShow(Wt::WAnimation(Wt::WAnimation::AnimationEffect::Fade, Wt::WAnimation::TimingFunction::EaseIn, 500));
priv_int->playerUI->updateDetailsFromServer(GroovePlayerMgr::getInstance()->currentTrack); 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->updateVoteableTracksFromServer(GroovePlayerMgr::getInstance()->currentVoteBatch);
priv_int->playerUI->updateVoteTrackState(); priv_int->playerUI->updateVoteTrackState();
if(currentUser.canUpload) priv_int->playerUI->mainDisplay->addTab(priv_int->playerUI->uploadPane, "Upload Track", Wt::WTabWidget::LazyLoading); 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); 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) void WebInterface::songChangedFromServer(AudioTrack nextTrack)
{ {
setTitle("Arbitrateor - Audio Jukebox : ["+nextTrack.trackName + "] " + nextTrack.trackArtistName);
priv_int->playerUI->updateDetailsFromServer(nextTrack); priv_int->playerUI->updateDetailsFromServer(nextTrack);
priv_int->playerUI->requestPane->updateRequestButtonState(); priv_int->playerUI->requestPane->updateRequestButtonState();
triggerUpdate(); triggerUpdate();

2
src/ui/RequestInterface.cpp
View File

@@ -140,7 +140,7 @@ void RequestInterface::searchClicked()
} }
//Do a like search on title, artist, and album on DB //Do a like search on title, artist, and album on DB
Wt::Dbo::collection<Wt::Dbo::ptr<AudioTrack>> trackOptions = sqlSession.find<AudioTrack>(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<Wt::Dbo::ptr<AudioTrack>> trackOptions = sqlSession.find<AudioTrack>(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 //Make sure all items are gone
for(RequestItem* item: foundItems) for(RequestItem* item: foundItems)