mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-01 01:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added concept of "RowFormatters" to TrackListView, and updated the

Browse Source 
default view to omit album name because there are headers. Then,
implemented a special RowFormatter for NowPlayingLayout that includes
the album name.
This commit is contained in:
casey 2016-06-30 21:50:10 -07:00
parent 35c222fe4a
commit ae3c20c9eb
3 changed files with 111 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/musikbox/app/layout/NowPlayingLayout.cpp
View File

@ -36,10 +36,18 @@
#include <cursespp/Colors.h>
#include <cursespp/Screen.h>
#include <cursespp/Text.h>
#include <core/library/LocalLibraryConstants.h>
#include <app/query/NowPlayingTrackListQuery.h>
#include <app/util/Duration.h>
#include "NowPlayingLayout.h"
#include <boost/format.hpp>
#include <boost/format/group.hpp>
#include <boost/lexical_cast.hpp>
#include <iomanip>
using namespace musik::core::library::constants;
using namespace musik::core;
@ -48,6 +56,13 @@ using namespace musik::core::library;
using namespace musik::box;
using namespace cursespp;
using boost::io::group;
using std::setw;
using std::setfill;
using std::setiosflags;
static std::string formatWithAlbum(TrackPtr track, size_t width);
NowPlayingLayout::NowPlayingLayout(
PlaybackService& playback,
musik::core::LibraryPtr library)
@ -77,7 +92,11 @@ void NowPlayingLayout::Layout() {
}
void NowPlayingLayout::InitializeWindows() {
this->trackList.reset(new TrackListView(this->playback, this->library));
this->trackList.reset(new TrackListView(
this->playback,
this->library,
std::bind(formatWithAlbum, std::placeholders::_1, std::placeholders::_2)));
this->trackList->Requeried.connect(this, &NowPlayingLayout::OnTrackListRequeried);
this->AddWindow(this->trackList);
this->Layout();
@ -123,3 +142,48 @@ bool NowPlayingLayout::KeyPress(const std::string& key) {
return LayoutBase::KeyPress(key);
}
#define TRACK_COL_WIDTH 3
#define ARTIST_COL_WIDTH 14
#define ALBUM_COL_WIDTH 14
#define DURATION_COL_WIDTH 5 /* 00:00 */
/* see TrackListView.cpp for more info */
#define DISPLAY_WIDTH(chars, str) \
chars + (str.size() - u8len(str))
static std::string formatWithAlbum(TrackPtr track, size_t width) {
std::string trackNum = track->GetValue(constants::Track::TRACK_NUM);
std::string artist = track->GetValue(constants::Track::ARTIST);
std::string album = track->GetValue(constants::Track::ALBUM);
std::string title = track->GetValue(constants::Track::TITLE);
std::string duration = track->GetValue(constants::Track::DURATION);
int column0Width = DISPLAY_WIDTH(TRACK_COL_WIDTH, trackNum);
int column2Width = DISPLAY_WIDTH(DURATION_COL_WIDTH, duration);
int column3Width = DISPLAY_WIDTH(ARTIST_COL_WIDTH, artist);
int column4Width = DISPLAY_WIDTH(ALBUM_COL_WIDTH, album);
size_t column1CharacterCount =
width -
column0Width -
column2Width -
column3Width -
column4Width -
(3 * 4); /* 3 = spacing */
int column1Width = DISPLAY_WIDTH(column1CharacterCount, title);
text::Ellipsize(artist, ARTIST_COL_WIDTH);
text::Ellipsize(album, ALBUM_COL_WIDTH);
text::Ellipsize(title, column1CharacterCount);
duration = duration::Duration(duration);
return boost::str(
boost::format("%s %s %s %s %s")
% group(setw(column0Width), setfill(' '), trackNum)
% group(setw(column1Width), setiosflags(std::ios::left), setfill(' '), title)
% group(setw(column2Width), setiosflags(std::ios::right), setfill(' '), duration)
% group(setw(column3Width), setiosflags(std::ios::left), setfill(' '), artist)
% group(setw(column4Width), setiosflags(std::ios::left), setfill(' '), album));
}

76
src/musikbox/app/window/TrackListView.cpp
View File

@ -64,7 +64,10 @@ using std::setw;
using std::setfill;
using std::setiosflags;
TrackListView::TrackListView(PlaybackService& playback, LibraryPtr library)
TrackListView::TrackListView(
PlaybackService& playback,
LibraryPtr library,
RowFormatter formatter)
: ListWindow(NULL)
, playback(playback) {
this->SetContentColor(CURSESPP_WHITE_ON_TRANSPARENT);
@ -73,6 +76,7 @@ TrackListView::TrackListView(PlaybackService& playback, LibraryPtr library)
this->playback.TrackChanged.connect(this, &TrackListView::OnTrackChanged);
this->adapter = new Adapter(*this);
this->lastQueryHash = 0;
this->formatter = formatter;
}
TrackListView::~TrackListView() {
@ -141,8 +145,7 @@ size_t TrackListView::Adapter::GetEntryCount() {
}
#define TRACK_COL_WIDTH 3
#define ARTIST_COL_WIDTH 14
#define ALBUM_COL_WIDTH 14
#define ARTIST_COL_WIDTH 17
#define DURATION_COL_WIDTH 5 /* 00:00 */
/* so this part is a bit tricky... we draw multiple columns, but we use
@ -152,6 +155,37 @@ constants) */
#define DISPLAY_WIDTH(chars, str) \
chars + (str.size() - u8len(str))
static std::string formatWithoutAlbum(TrackPtr track, size_t width) {
std::string trackNum = track->GetValue(constants::Track::TRACK_NUM);
std::string artist = track->GetValue(constants::Track::ARTIST);
std::string title = track->GetValue(constants::Track::TITLE);
std::string duration = track->GetValue(constants::Track::DURATION);
int column0Width = DISPLAY_WIDTH(TRACK_COL_WIDTH, trackNum);
int column2Width = DISPLAY_WIDTH(DURATION_COL_WIDTH, duration);
int column3Width = DISPLAY_WIDTH(ARTIST_COL_WIDTH, artist);
size_t column1CharacterCount =
width -
column0Width -
column2Width -
column3Width -
(3 * 3); /* 3 = spacing */
int column1Width = DISPLAY_WIDTH(column1CharacterCount, title);
text::Ellipsize(artist, ARTIST_COL_WIDTH);
text::Ellipsize(title, column1CharacterCount);
duration = duration::Duration(duration);
return boost::str(
boost::format("%s %s %s %s")
% group(setw(column0Width), setfill(' '), trackNum)
% group(setw(column1Width), setiosflags(std::ios::left), setfill(' '), title)
% group(setw(column2Width), setiosflags(std::ios::right), setfill(' '), duration)
% group(setw(column3Width), setiosflags(std::ios::left), setfill(' '), artist));
}
IScrollAdapter::EntryPtr TrackListView::Adapter::GetEntry(size_t index) {
bool selected = index == parent.GetSelectedIndex();
int64 attrs = selected ? COLOR_PAIR(CURSESPP_BLACK_ON_GREEN) : -1LL;
@ -171,39 +205,9 @@ IScrollAdapter::EntryPtr TrackListView::Adapter::GetEntry(size_t index) {
}
}
std::string trackNum = track->GetValue(constants::Track::TRACK_NUM);
std::string artist = track->GetValue(constants::Track::ARTIST);
std::string album = track->GetValue(constants::Track::ALBUM);
std::string title = track->GetValue(constants::Track::TITLE);
std::string duration = track->GetValue(constants::Track::DURATION);
int column0Width = DISPLAY_WIDTH(TRACK_COL_WIDTH, trackNum);
int column2Width = DISPLAY_WIDTH(DURATION_COL_WIDTH, duration);
int column3Width = DISPLAY_WIDTH(ARTIST_COL_WIDTH, artist);
int column4Width = DISPLAY_WIDTH(ALBUM_COL_WIDTH, album);
size_t column1CharacterCount =
this->GetWidth() -
column0Width -
column2Width -
column3Width -
column4Width -
(3 * 4); /* 3 = spacing */
int column1Width = DISPLAY_WIDTH(column1CharacterCount, title);
text::Ellipsize(artist, ARTIST_COL_WIDTH);
text::Ellipsize(album, ALBUM_COL_WIDTH);
text::Ellipsize(title, column1CharacterCount);
duration = duration::Duration(duration);
std::string text = boost::str(
boost::format("%s %s %s %s %s")
% group(setw(column0Width), setfill(' '), trackNum)
% group(setw(column1Width), setiosflags(std::ios::left), setfill(' '), title)
% group(setw(column2Width), setiosflags(std::ios::right), setfill(' '), duration)
% group(setw(column3Width), setiosflags(std::ios::left), setfill(' '), artist)
% group(setw(column4Width), setiosflags(std::ios::left), setfill(' '), album));
std::string text = parent.formatter
? parent.formatter(track, this->GetWidth())
: formatWithoutAlbum(track, this->GetWidth());
if (this->parent.headers->find(index) != this->parent.headers->end()) {
std::string album = track->GetValue(constants::Track::ALBUM);

7
src/musikbox/app/window/TrackListView.h
View File

@ -56,11 +56,15 @@ namespace musik {
public:
sigslot::signal0<> Requeried;
typedef std::function<std::string(
musik::core::TrackPtr, size_t)> RowFormatter;
typedef std::shared_ptr<std::set<size_t> > Headers;
TrackListView(
PlaybackService& playback,
musik::core::LibraryPtr library);
musik::core::LibraryPtr library,
RowFormatter formatter = RowFormatter());
virtual ~TrackListView();
@ -97,6 +101,7 @@ namespace musik {
musik::core::TrackPtr playing;
musik::core::LibraryPtr library;
size_t lastQueryHash;
RowFormatter formatter;
};
}
}