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

The play queue now shows sequential track numbers instead of ones read

Browse Source 
from metadata.
This commit is contained in:
casey langen 2018-01-29 22:57:26 -08:00
parent 402aab9d2c
commit b18ed5ab18
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/runtime/MessageQueue.h
View File

@ -67,7 +67,6 @@ namespace musik { namespace core { namespace runtime {
private:
typedef std::weak_ptr<IMessageTarget> IWeakMessageTarget;
struct EnqueuedMessage {
IMessagePtr message;
std::chrono::milliseconds time;

15
src/musikcube/app/layout/NowPlayingLayout.cpp
View File

@ -59,7 +59,7 @@ using namespace cursespp;
static std::set<std::string> EDIT_KEYS;
static std::string formatWithAlbum(TrackPtr track, size_t width);
static std::string formatWithAlbum(TrackPtr track, size_t index, size_t width);
NowPlayingLayout::NowPlayingLayout(
musik::core::audio::PlaybackService& playback,
@ -126,7 +126,7 @@ void NowPlayingLayout::InitializeWindows() {
this->trackListView.reset(new TrackListView(
this->playback,
this->library,
std::bind(formatWithAlbum, std::placeholders::_1, std::placeholders::_2),
std::bind(formatWithAlbum, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
std::bind(&NowPlayingLayout::RowDecorator, this, std::placeholders::_1, std::placeholders::_2)));
this->trackListView->SetFrameTitle(_TSTR("playqueue_title"));
@ -283,12 +283,11 @@ bool NowPlayingLayout::ProcessEditOperation(const std::string& key) {
#define ARTIST_COL_WIDTH 14
#define ALBUM_COL_WIDTH 14
#define DURATION_COL_WIDTH 5 /* 00:00 */
#define DIGITS(x) (x > 9 ? (int) log10((double) x) + 1 : 1)
static std::string formatWithAlbum(TrackPtr track, size_t width) {
std::string trackNum = text::Align(
track->GetString(constants::Track::TRACK_NUM),
text::AlignRight,
TRACK_COL_WIDTH);
static std::string formatWithAlbum(TrackPtr track, size_t index, size_t width) {
size_t trackColWidth = std::max(TRACK_COL_WIDTH, DIGITS(index + 1));
std::string trackNum = text::Align(std::to_string(index + 1), text::AlignRight, trackColWidth);
std::string duration = text::Align(
duration::Duration(track->GetString(constants::Track::DURATION)),
@ -307,7 +306,7 @@ static std::string formatWithAlbum(TrackPtr track, size_t width) {
int titleWidth =
width -
TRACK_COL_WIDTH -
trackColWidth -
DURATION_COL_WIDTH -
ALBUM_COL_WIDTH -
ARTIST_COL_WIDTH -

2
src/musikcube/app/window/TrackListView.cpp
View File

@ -461,7 +461,7 @@ IScrollAdapter::EntryPtr TrackListView::Adapter::GetEntry(cursespp::ScrollableWi
}
std::string text = parent.formatter
? parent.formatter(track, this->GetWidth())
? parent.formatter(track, rawIndex, this->GetWidth())
: formatWithoutAlbum(track, rawIndex, this->GetWidth(), parent.trackNumType);
std::shared_ptr<TrackListEntry> entry(

2
src/musikcube/app/window/TrackListView.h
View File

@ -65,7 +65,7 @@ namespace musik {
sigslot::signal1<musik::core::db::local::TrackListQueryBase*> Requeried;
/* types */
typedef std::function<std::string(TrackPtr, size_t)> RowFormatter;
typedef std::function<std::string(TrackPtr, size_t, size_t)> RowFormatter;
typedef std::function<int64_t(TrackPtr, size_t)> RowDecorator;
typedef std::shared_ptr<std::set<size_t> > Headers;