Hello community,
here is the log from the commit of package cmus for openSUSE:Factory checked in at 2018-04-24 15:32:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cmus (Old)
and /work/SRC/openSUSE:Factory/.cmus.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmus"
Tue Apr 24 15:32:17 2018 rev:5 rq:599782 version:2.8.0~20180422.gb595b8c
Changes:
--------
--- /work/SRC/openSUSE:Factory/cmus/cmus.changes 2018-02-07 18:42:36.668817793 +0100
+++ /work/SRC/openSUSE:Factory/.cmus.new/cmus.changes 2018-04-24 15:32:22.691852912 +0200
@@ -1,0 +2,15 @@
+Sun Apr 22 16:40:11 UTC 2018 - 9@cirno.systems
+
+- Update to version 2.8.0~20180422.gb595b8c:
+ * Fix ffmpeg plugin build (#793)
+ * Correct parsing for cue files with byte order mark (#774)
+ * Add dracula theme
+ * Add albumartist to status_display_program.
+ * options: add color_win_cur_attr
+ * Add command to raise VTE window + implement MPRIS Raise method
+ * Don't call mpris_seeked from within the player
+ * Make player_set_op accept an owned string
+ * Add the delegate series of functions
+ * Make most player functions delegated
+
+-------------------------------------------------------------------
Old:
----
cmus-2.8.0~20171019.g3a4ce9c.tar.xz
New:
----
_servicedata
cmus-2.8.0~20180422.gb595b8c.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmus.spec ++++++
--- /var/tmp/diff_new_pack.y2Vby8/_old 2018-04-24 15:32:25.119765070 +0200
+++ /var/tmp/diff_new_pack.y2Vby8/_new 2018-04-24 15:32:25.123764926 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cmus
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2007-2012 Pascal Bleser
#
# All modifications and additions to the file contributed by third parties
@@ -20,10 +20,10 @@
%bcond_without sndio
Name: cmus
-Version: 2.8.0~20171019.g3a4ce9c
+Version: 2.8.0~20180422.gb595b8c
Release: 0
Summary: Text-mode music player
-License: GPL-2.0
+License: GPL-2.0-only
Group: Productivity/Multimedia/Sound/Players
Url: https://cmus.github.io/
Source: %{name}-%{version}.tar.xz
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/cmus/cmus.git</param>
<param name="changesrevision">b595b8cd7fee10824e5351faf2def28ed5778e59</param></service></servicedata>++++++ cmus-2.8.0~20171019.g3a4ce9c.tar.xz -> cmus-2.8.0~20180422.gb595b8c.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/FETCH_HEAD new/cmus-2.8.0~20180422.gb595b8c/.git/FETCH_HEAD
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/FETCH_HEAD 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-3a4ce9c415d0c411351bc7c60f20458394538a0d branch 'master' of https://github.com/cmus/cmus
-d9bc784627db2ac3a9088bb9794199b5aca6ee68 not-for-merge branch 'maint' of https://github.com/cmus/cmus
-f15b46a4a082f604adc8ed25e03c16e736b4a812 not-for-merge branch 'maint-2.3' of https://github.com/cmus/cmus
-100e2f4d0f6772082829b8245b24954f82197ea8 not-for-merge branch 'maint-2.4' of https://github.com/cmus/cmus
-7f05c9e7f8461729948ecb20e2883388db99fbb2 not-for-merge branch 'maint-2.5' of https://github.com/cmus/cmus
-c41cc2262e5bb40990607da381ea29bf89cf9c6b not-for-merge branch 'maint-2.6' of https://github.com/cmus/cmus
-9d37708a93c9fadeebe0eb9f8f67310e4fe55156 not-for-merge branch 'pu' of https://github.com/cmus/cmus
-c0f452a400a97280c0823fa4e1c25228526b93aa not-for-merge branch 'revert-442-set_priority2' of https://github.com/cmus/cmus
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/ORIG_HEAD new/cmus-2.8.0~20180422.gb595b8c/.git/ORIG_HEAD
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/ORIG_HEAD 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/ORIG_HEAD 2018-04-22 18:15:30.000000000 +0200
@@ -1 +1 @@
-61d4b2bbb38d5e4af1734912b547e25ce9760462
+b595b8cd7fee10824e5351faf2def28ed5778e59
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/hooks/fsmonitor-watchman.sample new/cmus-2.8.0~20180422.gb595b8c/.git/hooks/fsmonitor-watchman.sample
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/hooks/fsmonitor-watchman.sample 1970-01-01 01:00:00.000000000 +0100
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/hooks/fsmonitor-watchman.sample 2018-04-22 18:15:30.000000000 +0200
@@ -0,0 +1,114 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 1) and a time in nanoseconds
+# formatted as a string and outputs to stdout all files that have been
+# modified since the given time. Paths must be relative to the root of
+# the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $time) = @ARGV;
+
+# Check the hook interface version
+
+if ($version == 1) {
+ # convert nanoseconds to seconds
+ $time = int $time / 1000000000;
+} else {
+ die "Unsupported query-fsmonitor hook version '$version'.\n" .
+ "Falling back to scanning...\n";
+}
+
+my $git_work_tree;
+if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+ $git_work_tree = Win32::GetCwd();
+ $git_work_tree =~ tr/\\/\//;
+} else {
+ require Cwd;
+ $git_work_tree = Cwd::cwd();
+}
+
+my $retry = 1;
+
+launch_watchman();
+
+sub launch_watchman {
+
+ my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+ or die "open2() failed: $!\n" .
+ "Falling back to scanning...\n";
+
+ # In the query expression below we're asking for names of files that
+ # changed since $time but were not transient (ie created after
+ # $time but no longer exist).
+ #
+ # To accomplish this, we're using the "since" generator to use the
+ # recency index to select candidate nodes and "fields" to limit the
+ # output to file names only. Then we're using the "expression" term to
+ # further constrain the results.
+ #
+ # The category of transient files that we want to ignore will have a
+ # creation clock (cclock) newer than $time_t value and will also not
+ # currently exist.
+
+ my $query = <<" END";
+ ["query", "$git_work_tree", {
+ "since": $time,
+ "fields": ["name"],
+ "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]]
+ }]
+ END
+
+ print CHLD_IN $query;
+ close CHLD_IN;
+ my $response = do {local $/; };
+
+ die "Watchman: command returned no output.\n" .
+ "Falling back to scanning...\n" if $response eq "";
+ die "Watchman: command returned invalid output: $response\n" .
+ "Falling back to scanning...\n" unless $response =~ /^\{/;
+
+ my $json_pkg;
+ eval {
+ require JSON::XS;
+ $json_pkg = "JSON::XS";
+ 1;
+ } or do {
+ require JSON::PP;
+ $json_pkg = "JSON::PP";
+ };
+
+ my $o = $json_pkg->new->utf8->decode($response);
+
+ if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) {
+ print STDERR "Adding '$git_work_tree' to watchman's watch list.\n";
+ $retry--;
+ qx/watchman watch "$git_work_tree"/;
+ die "Failed to make watchman watch '$git_work_tree'.\n" .
+ "Falling back to scanning...\n" if $? != 0;
+
+ # Watchman will always return all files on the first query so
+ # return the fast "everything is dirty" flag to git and do the
+ # Watchman query just to get it over with now so we won't pay
+ # the cost in git to look up each individual file.
+ print "/\0";
+ eval { launch_watchman() };
+ exit 0;
+ }
+
+ die "Watchman: $o->{error}.\n" .
+ "Falling back to scanning...\n" if $o->{error};
+
+ binmode STDOUT, ":utf8";
+ local $, = "\0";
+ print @{$o->{files}};
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/hooks/pre-rebase.sample new/cmus-2.8.0~20180422.gb595b8c/.git/hooks/pre-rebase.sample
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/hooks/pre-rebase.sample 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/hooks/pre-rebase.sample 2018-04-22 18:15:30.000000000 +0200
@@ -58,7 +58,7 @@
not_in_topic=`git rev-list "^$topic" master`
if test -z "$not_in_topic"
then
- echo >&2 "$topic is already up-to-date with master"
+ echo >&2 "$topic is already up to date with master"
exit 1 ;# we could allow it, but there is no point.
else
exit 0
@@ -88,9 +88,7 @@
exit 1
fi
-exit 0
-
-################################################################
+<<\DOC_END
This sample hook safeguards topic branches that have been
published from being rewound.
@@ -167,3 +165,5 @@
git rev-list master..topic
if this is empty, it is fully merged to "master".
+
+DOC_END
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/hooks/prepare-commit-msg.sample new/cmus-2.8.0~20180422.gb595b8c/.git/hooks/prepare-commit-msg.sample
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/hooks/prepare-commit-msg.sample 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/hooks/prepare-commit-msg.sample 2018-04-22 18:15:30.000000000 +0200
@@ -9,8 +9,8 @@
#
# To enable this hook, rename this file to "prepare-commit-msg".
-# This hook includes three examples. The first comments out the
-# "Conflicts:" part of a merge commit.
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
#
# The second includes the output of "git diff --name-status -r"
# into the message, just before the "git status" output. It is
@@ -20,17 +20,23 @@
# The third example adds a Signed-off-by line to the message, that can
# still be edited. This is rarely a good idea.
-case "$2,$3" in
- merge,)
- /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
-# ,|template,)
-# /usr/bin/perl -i.bak -pe '
-# print "\n" . `git diff --cached --name-status -r`
-# if /^#/ && $first++ == 0' "$1" ;;
+/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
- *) ;;
-esac
+# case "$COMMIT_SOURCE,$SHA1" in
+# ,|template,)
+# /usr/bin/perl -i.bak -pe '
+# print "\n" . `git diff --cached --name-status -r`
+# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+# *) ;;
+# esac
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/index and new/cmus-2.8.0~20180422.gb595b8c/.git/index differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/logs/HEAD new/cmus-2.8.0~20180422.gb595b8c/.git/logs/HEAD
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/logs/HEAD 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/logs/HEAD 2018-04-22 18:15:30.000000000 +0200
@@ -1,4 +1,2 @@
-0000000000000000000000000000000000000000 8e45e7cba5ac284d6b65bc4c51881607e3f117d1 Martin Herkt 1498685829 +0200 clone: from https://github.com/cmus/cmus.git
-8e45e7cba5ac284d6b65bc4c51881607e3f117d1 8e45e7cba5ac284d6b65bc4c51881607e3f117d1 Martin Herkt 1498685829 +0200 reset: moving to origin/master
-8e45e7cba5ac284d6b65bc4c51881607e3f117d1 61d4b2bbb38d5e4af1734912b547e25ce9760462 Martin Herkt 1499005697 +0200 reset: moving to origin/master
-61d4b2bbb38d5e4af1734912b547e25ce9760462 3a4ce9c415d0c411351bc7c60f20458394538a0d Martin Herkt 1509574288 +0100 reset: moving to origin/master
+0000000000000000000000000000000000000000 b595b8cd7fee10824e5351faf2def28ed5778e59 Martin Herkt 1524415211 +0200 clone: from https://github.com/cmus/cmus.git
+b595b8cd7fee10824e5351faf2def28ed5778e59 b595b8cd7fee10824e5351faf2def28ed5778e59 Martin Herkt 1524415211 +0200 reset: moving to origin/master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/logs/refs/heads/master new/cmus-2.8.0~20180422.gb595b8c/.git/logs/refs/heads/master
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/logs/refs/heads/master 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/logs/refs/heads/master 2018-04-22 18:15:30.000000000 +0200
@@ -1,3 +1 @@
-0000000000000000000000000000000000000000 8e45e7cba5ac284d6b65bc4c51881607e3f117d1 Martin Herkt 1498685829 +0200 clone: from https://github.com/cmus/cmus.git
-8e45e7cba5ac284d6b65bc4c51881607e3f117d1 61d4b2bbb38d5e4af1734912b547e25ce9760462 Martin Herkt 1499005697 +0200 reset: moving to origin/master
-61d4b2bbb38d5e4af1734912b547e25ce9760462 3a4ce9c415d0c411351bc7c60f20458394538a0d Martin Herkt 1509574288 +0100 reset: moving to origin/master
+0000000000000000000000000000000000000000 b595b8cd7fee10824e5351faf2def28ed5778e59 Martin Herkt 1524415211 +0200 clone: from https://github.com/cmus/cmus.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/logs/refs/remotes/origin/HEAD new/cmus-2.8.0~20180422.gb595b8c/.git/logs/refs/remotes/origin/HEAD
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/logs/refs/remotes/origin/HEAD 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/logs/refs/remotes/origin/HEAD 2018-04-22 18:15:30.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000 8e45e7cba5ac284d6b65bc4c51881607e3f117d1 Martin Herkt 1498685829 +0200 clone: from https://github.com/cmus/cmus.git
+0000000000000000000000000000000000000000 b595b8cd7fee10824e5351faf2def28ed5778e59 Martin Herkt 1524415211 +0200 clone: from https://github.com/cmus/cmus.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/logs/refs/remotes/origin/master new/cmus-2.8.0~20180422.gb595b8c/.git/logs/refs/remotes/origin/master
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/logs/refs/remotes/origin/master 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/logs/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-8e45e7cba5ac284d6b65bc4c51881607e3f117d1 61d4b2bbb38d5e4af1734912b547e25ce9760462 Martin Herkt 1499005696 +0200 fetch --tags: fast-forward
-61d4b2bbb38d5e4af1734912b547e25ce9760462 3a4ce9c415d0c411351bc7c60f20458394538a0d Martin Herkt 1509574287 +0100 fetch --tags: fast-forward
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/03/3e7f08c2540630bead7b8a076d49cac440bf01 and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/03/3e7f08c2540630bead7b8a076d49cac440bf01 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/15/199a3f0213d6b91db34006c39ea72af1f1e39d new/cmus-2.8.0~20180422.gb595b8c/.git/objects/15/199a3f0213d6b91db34006c39ea72af1f1e39d
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/15/199a3f0213d6b91db34006c39ea72af1f1e39d 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/objects/15/199a3f0213d6b91db34006c39ea72af1f1e39d 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-xu±jÃ0E;û+t,i$K²-%C¡]]º€'ÙÔ¶\E¢äï+h2v»îœpl\)è Aœgmd`Ðõf@ÖwNjVJf<ãÍÖVq+ëžDéHxßrÇÈ©9ã
-%ÂÜûB;cµ7
V^+-ÕcA¶d
çè,y Þ
®ðA9ÅËW8?ôŒÝÑ1,8ÍÏ6./ÀSZsÅ5<1ÁXSiÌT¯Šü^Öh¯Ç0å±fÍR ØÊ
\ No newline at end of file
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/67/8b7ca1916ff911b050c2ecbf1c305b1d549a63 and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/67/8b7ca1916ff911b050c2ecbf1c305b1d549a63 differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/6c/66186ffbf5fbdab68b390f66c677c1b86b301d and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/6c/66186ffbf5fbdab68b390f66c677c1b86b301d differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/74/787c92613642a1268014b42987817a3c3e168a and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/74/787c92613642a1268014b42987817a3c3e168a differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/7d/48061468056bf0656b91473ea02fd4ace1d2cd new/cmus-2.8.0~20180422.gb595b8c/.git/objects/7d/48061468056bf0656b91473ea02fd4ace1d2cd
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/7d/48061468056bf0656b91473ea02fd4ace1d2cd 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/objects/7d/48061468056bf0656b91473ea02fd4ace1d2cd 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-xÁJ1=ç)^ÙtiÑ
-RÁë$m] )êÛ»ÀÛÏßǧ
-ûZTAS
-1°K Nœ'ê$ 2'îÚÐaÏ.$Ro>¥èXZbÛcC6¹À]"ºhYÅ7ÒSOj9¹ÕËTàk*%~ÃãßZ³×8姹ŸuMëîÍLç{Uÿ-骰8nöð|Ø¿mwëÓöð
-§ãûfÃñŠpÖQTM~àc÷b~ßœR`
\ No newline at end of file
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/80/61992b66e1d24725a6947f1935c3d0b6e8d1e6 and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/80/61992b66e1d24725a6947f1935c3d0b6e8d1e6 differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/8c/8428848fea57a68ccff1a7c6a61d5d97674803 and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/8c/8428848fea57a68ccff1a7c6a61d5d97674803 differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/92/b2d62813ad9f6b95951c010cc0f475689a1a0e and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/92/b2d62813ad9f6b95951c010cc0f475689a1a0e differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/93/991c991bbaf8482059ba21878c6ad541760c8b and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/93/991c991bbaf8482059ba21878c6ad541760c8b differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/9c/ac57c1ac46f5c387c2f051c9b5d98b7978cec6 new/cmus-2.8.0~20180422.gb595b8c/.git/objects/9c/ac57c1ac46f5c387c2f051c9b5d98b7978cec6
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/9c/ac57c1ac46f5c387c2f051c9b5d98b7978cec6 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/objects/9c/ac57c1ac46f5c387c2f051c9b5d98b7978cec6 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-xuÁjÃ0D{öW,é±$,[¶ 6Ž€ !
^WÒÚ1Ø«È4þû
-Jœ,Ãcfvמ®k2œÈZmŽ&C-©(8/Q3Rʪ2×%«ÔSè©Às®¥\X©·ZdI#abÅ+NBÙ¿°YÉ$ÏdÉr©+&ãT<+!K+¡!nScÃÙyxóT;?Áw {XÖh1ÜЪî°iÆuOñVf"¹&K"UMx5,{çih§UÝóšÿ%;ò5Á0¶-xúéàŸ*ï:øëãµµó(çqËÐŽ×'É{ÛÌëŒìwÍöùŽÙÀéø¹AÓ jêÉc z¯íë/%zÁ
\ No newline at end of file
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/af/46b82a7965a19f47adc10ca09a3713bb2a4b42 and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/af/46b82a7965a19f47adc10ca09a3713bb2a4b42 differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/b7/e4945fcec2ad5094fdc64f8d105c38cfe6ad30 and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/b7/e4945fcec2ad5094fdc64f8d105c38cfe6ad30 differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/bf/143a1396c2a0db53f588a402463f079c162e13 and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/bf/143a1396c2a0db53f588a402463f079c162e13 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/c5/1c4cd614a4de3b7e1721d0ed57e11015a4143b new/cmus-2.8.0~20180422.gb595b8c/.git/objects/c5/1c4cd614a4de3b7e1721d0ed57e11015a4143b
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/c5/1c4cd614a4de3b7e1721d0ed57e11015a4143b 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/objects/c5/1c4cd614a4de3b7e1721d0ed57e11015a4143b 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-x}»NÅ0D©ó+Q"ߥ+t;hhøµœy8ÄßéBK5Òèb&ä
-RwµÅÁ¢AZoÉY5D«ÜèÑiF)
*ÙíXh«`xT^xïå5)¹Êqáµ²$t8uÌȥàäIXr
-£s!4Æ+æ€Á©¶:ç ç<Ãå×vP9ú-Ú×ï~ZêÜ|rz®ÌàŽ&ëÎö\V©ÀËR_˯výWëÞšL{[W(ôÙèšpo±äÓùÑæq¢õxmÇÓºîRþ"¹ù-¬íXòy£Æ3a€òQïtk
\ No newline at end of file
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/d6/e1c563e6c8a63d160fbef6557aaf126e2c961f and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/d6/e1c563e6c8a63d160fbef6557aaf126e2c961f differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/da/200020a985e4778aa1e23f2bae14a278c2de69 and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/da/200020a985e4778aa1e23f2bae14a278c2de69 differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/da/3d3b4f3de1f15819492456589121c47cec0213 and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/da/3d3b4f3de1f15819492456589121c47cec0213 differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/df/724a1856836b7addba6b9eadf41b4b17a045a9 and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/df/724a1856836b7addba6b9eadf41b4b17a045a9 differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/ed/87a53c373a61cb7e9748d749fba956cf336a43 and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/ed/87a53c373a61cb7e9748d749fba956cf336a43 differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/ed/dbcb96c4ab6e77118ab0e99d985b80f96bd1e7 and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/ed/dbcb96c4ab6e77118ab0e99d985b80f96bd1e7 differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/pack/pack-2fd10abf0c6ba518dcb97a2e353e833867d02b83.idx and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/pack/pack-2fd10abf0c6ba518dcb97a2e353e833867d02b83.idx differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/pack/pack-2fd10abf0c6ba518dcb97a2e353e833867d02b83.pack and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/pack/pack-2fd10abf0c6ba518dcb97a2e353e833867d02b83.pack differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/pack/pack-7b7cd7d5539efcaba1ac746b0f9300dd1d7f31c9.idx and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/pack/pack-7b7cd7d5539efcaba1ac746b0f9300dd1d7f31c9.idx differ
Binary files old/cmus-2.8.0~20171019.g3a4ce9c/.git/objects/pack/pack-7b7cd7d5539efcaba1ac746b0f9300dd1d7f31c9.pack and new/cmus-2.8.0~20180422.gb595b8c/.git/objects/pack/pack-7b7cd7d5539efcaba1ac746b0f9300dd1d7f31c9.pack differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/packed-refs new/cmus-2.8.0~20180422.gb595b8c/.git/packed-refs
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/packed-refs 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/packed-refs 2018-04-22 18:15:30.000000000 +0200
@@ -1,10 +1,10 @@
-# pack-refs with: peeled fully-peeled
+# pack-refs with: peeled fully-peeled sorted
d9bc784627db2ac3a9088bb9794199b5aca6ee68 refs/remotes/origin/maint
f15b46a4a082f604adc8ed25e03c16e736b4a812 refs/remotes/origin/maint-2.3
100e2f4d0f6772082829b8245b24954f82197ea8 refs/remotes/origin/maint-2.4
7f05c9e7f8461729948ecb20e2883388db99fbb2 refs/remotes/origin/maint-2.5
c41cc2262e5bb40990607da381ea29bf89cf9c6b refs/remotes/origin/maint-2.6
-8e45e7cba5ac284d6b65bc4c51881607e3f117d1 refs/remotes/origin/master
+b595b8cd7fee10824e5351faf2def28ed5778e59 refs/remotes/origin/master
9d37708a93c9fadeebe0eb9f8f67310e4fe55156 refs/remotes/origin/pu
c0f452a400a97280c0823fa4e1c25228526b93aa refs/remotes/origin/revert-442-set_priority2
8aab1ecdb16cdcad0ca6de3415b3e66b58c7c260 refs/tags/gitorious
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/refs/heads/master new/cmus-2.8.0~20180422.gb595b8c/.git/refs/heads/master
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/refs/heads/master 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/refs/heads/master 2018-04-22 18:15:30.000000000 +0200
@@ -1 +1 @@
-3a4ce9c415d0c411351bc7c60f20458394538a0d
+b595b8cd7fee10824e5351faf2def28ed5778e59
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/.git/refs/remotes/origin/master new/cmus-2.8.0~20180422.gb595b8c/.git/refs/remotes/origin/master
--- old/cmus-2.8.0~20171019.g3a4ce9c/.git/refs/remotes/origin/master 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/.git/refs/remotes/origin/master 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-3a4ce9c415d0c411351bc7c60f20458394538a0d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/Doc/cmus.txt new/cmus-2.8.0~20180422.gb595b8c/Doc/cmus.txt
--- old/cmus-2.8.0~20171019.g3a4ce9c/Doc/cmus.txt 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/Doc/cmus.txt 2018-04-22 18:15:30.000000000 +0200
@@ -519,6 +519,9 @@
@li -i
ask before exiting
+raise-vte
+ Raise the virtual terminal emulator window. Works only in X session.
+
rand
Randomizes (shuffles) the tracks in the library, playlist or queue view.
@@ -866,6 +869,9 @@
color_win_cur (lightyellow) [`Color`]
Color of currently playing track.
+color_win_cur_attr (default) [`Attributes`]
+ Currently playing track attributes.
+
color_win_cur_sel_bg (blue) [`Color`]
Background color of the selected row which is also the currently
playing track in active window.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/cmus.c new/cmus-2.8.0~20180422.gb595b8c/cmus.c
--- old/cmus-2.8.0~20171019.g3a4ce9c/cmus.c 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/cmus.c 2018-04-22 18:15:30.000000000 +0200
@@ -43,6 +43,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -60,6 +61,11 @@
static int cmus_next_file_provided;
static struct track_info *cmus_next_file;
+static int x11_init_done = 0;
+static void *(*x11_open)(void *) = NULL;
+static int (*x11_raise)(void *, int) = NULL;
+static int (*x11_close)(void *) = NULL;
+
int cmus_init(void)
{
playable_exts = ip_get_supported_extensions();
@@ -441,3 +447,59 @@
{
init_pipes(&cmus_next_track_request_fd, &cmus_next_track_request_fd_priv);
}
+
+static int cmus_can_raise_vte_x11(void)
+{
+ return getenv("DISPLAY") && getenv("WINDOWID");
+}
+
+int cmus_can_raise_vte(void)
+{
+ return cmus_can_raise_vte_x11();
+}
+
+static int cmus_raise_vte_x11_error(void)
+{
+ return 0;
+}
+
+void cmus_raise_vte(void)
+{
+ if (cmus_can_raise_vte_x11()) {
+ if (!x11_init_done) {
+ void *x11;
+
+ x11_init_done = 1;
+ x11 = dlopen("libX11.so", RTLD_LAZY);
+
+ if (x11) {
+ int (*x11_error)(void *);
+
+ x11_error = dlsym(x11, "XSetErrorHandler");
+ x11_open = dlsym(x11, "XOpenDisplay");
+ x11_raise = dlsym(x11, "XRaiseWindow");
+ x11_close = dlsym(x11, "XCloseDisplay");
+
+ if (x11_error) {
+ x11_error(cmus_raise_vte_x11_error);
+ }
+ }
+ }
+
+ if (x11_open && x11_raise && x11_close) {
+ char *xid_str;
+ long int xid = 0;
+
+ xid_str = getenv("WINDOWID");
+ if (!str_to_int(xid_str, &xid) && xid != 0) {
+ void *display;
+
+ display = x11_open(NULL);
+ if (display) {
+ x11_raise(display, (int) xid);
+ x11_close(display);
+ }
+ }
+ }
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/cmus.h new/cmus-2.8.0~20180422.gb595b8c/cmus.h
--- old/cmus-2.8.0~20171019.g3a4ce9c/cmus.h 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/cmus.h 2018-04-22 18:15:30.000000000 +0200
@@ -90,4 +90,7 @@
void cmus_provide_next_track(void);
void cmus_track_request_init(void);
+int cmus_can_raise_vte(void);
+void cmus_raise_vte(void);
+
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/command_mode.c new/cmus-2.8.0~20180422.gb595b8c/command_mode.c
--- old/cmus-2.8.0~20171019.g3a4ce9c/command_mode.c 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/command_mode.c 2018-04-22 18:15:30.000000000 +0200
@@ -1374,6 +1374,11 @@
}
}
+static void cmd_raise_vte(char *arg)
+{
+ cmus_raise_vte();
+}
+
static void cmd_rand(char *arg)
{
switch (cur_view) {
@@ -2551,6 +2556,7 @@
{ "pl-rename", cmd_pl_rename, 1, -1, NULL, 0, 0 },
{ "push", cmd_push, 1, -1, expand_commands, 0, 0 },
{ "pwd", cmd_pwd, 0, 0, NULL, 0, 0 },
+ { "raise-vte", cmd_raise_vte, 0, 0, NULL, 0, 0 },
{ "rand", cmd_rand, 0, 0, NULL, 0, 0 },
{ "quit", cmd_quit, 0, 1, NULL, 0, 0 },
{ "refresh", cmd_refresh, 0, 0, NULL, 0, 0 },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/cue.c new/cmus-2.8.0~20180422.gb595b8c/cue.c
--- old/cmus-2.8.0~20171019.g3a4ce9c/cue.c 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/cue.c 2018-04-22 18:15:30.000000000 +0200
@@ -481,7 +481,15 @@
char *buf = mmap_file(file, &size);
if (size == -1)
return NULL;
- struct cue_sheet *rv = cue_parse(buf, size);
+ struct cue_sheet *rv;
+
+ // Check for UTF-8 BOM, and skip ahead if found
+ if (size >= 3 && memcmp(buf, "\xEF\xBB\xBF", 3) == 0) {
+ rv = cue_parse(buf + 3, size - 3);
+ } else {
+ rv = cue_parse(buf, size);
+ }
+
munmap(buf, size);
return rv;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/data/dracula.theme new/cmus-2.8.0~20180422.gb595b8c/data/dracula.theme
--- old/cmus-2.8.0~20171019.g3a4ce9c/data/dracula.theme 1970-01-01 01:00:00.000000000 +0100
+++ new/cmus-2.8.0~20180422.gb595b8c/data/dracula.theme 2018-04-22 18:15:30.000000000 +0200
@@ -0,0 +1,24 @@
+### 'Dracula' theme for CMus (for 255 color terms)
+set color_cmdline_bg=default
+set color_cmdline_fg=231
+set color_error=009
+set color_info=231
+set color_separator=004
+set color_statusline_bg=default
+set color_statusline_fg=231
+set color_titleline_bg=010
+set color_titleline_fg=236
+set color_win_bg=default
+set color_win_cur=010
+set color_win_cur_sel_bg=010
+set color_win_cur_sel_fg=016
+set color_win_dir=004
+set color_win_fg=004
+set color_win_inactive_cur_sel_bg=default
+set color_win_inactive_cur_sel_fg=014
+set color_win_inactive_sel_bg=default
+set color_win_inactive_sel_fg=014
+set color_win_sel_bg=004
+set color_win_sel_fg=236
+set color_win_title_bg=default
+set color_win_title_fg=014
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/ip/ffmpeg.c new/cmus-2.8.0~20180422.gb595b8c/ip/ffmpeg.c
--- old/cmus-2.8.0~20171019.g3a4ce9c/ip/ffmpeg.c 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/ip/ffmpeg.c 2018-04-22 18:15:30.000000000 +0200
@@ -182,8 +182,8 @@
break;
}
- if (codec->capabilities & CODEC_CAP_TRUNCATED)
- cc->flags |= CODEC_FLAG_TRUNCATED;
+ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
+ cc->flags |= AV_CODEC_FLAG_TRUNCATED;
if (avcodec_open2(cc, codec, NULL) < 0) {
d_print("could not open codec: %d, %s\n", cc->codec_id, avcodec_get_name(cc->codec_id));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/mpris.c new/cmus-2.8.0~20180422.gb595b8c/mpris.c
--- old/cmus-2.8.0~20171019.g3a4ce9c/mpris.c 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/mpris.c 2018-04-22 18:15:30.000000000 +0200
@@ -68,6 +68,22 @@
return sd_bus_reply_method_return(value, "");
}
+static int mpris_raise_vte(sd_bus_message *m, void *_userdata,
+ sd_bus_error *_ret_error)
+{
+ cmus_raise_vte();
+ return sd_bus_reply_method_return(m, "");
+}
+
+static int mpris_can_raise_vte(sd_bus *_bus, const char *_path,
+ const char *_interface, const char *_property,
+ sd_bus_message *reply, void *_userdata,
+ sd_bus_error *_ret_error)
+{
+ uint32_t b = cmus_can_raise_vte();
+ return sd_bus_message_append_basic(reply, 'b', &b);
+}
+
static int mpris_identity(sd_bus *_bus, const char *_path,
const char *_interface, const char *_property,
sd_bus_message *reply, void *_userdata,
@@ -404,12 +420,12 @@
static const sd_bus_vtable media_player2_vt[] = {
SD_BUS_VTABLE_START(0),
- SD_BUS_METHOD("Raise", "", "", mpris_msg_ignore, 0),
+ SD_BUS_METHOD("Raise", "", "", mpris_raise_vte, 0),
SD_BUS_METHOD("Quit", "", "", mpris_msg_ignore, 0),
MPRIS_PROP("CanQuit", "b", mpris_read_false),
MPRIS_WPROP("Fullscreen", "b", mpris_read_false, mpris_write_ignore),
MPRIS_PROP("CanSetFullscreen", "b", mpris_read_false),
- MPRIS_PROP("CanRaise", "b", mpris_read_false),
+ MPRIS_PROP("CanRaise", "b", mpris_can_raise_vte),
MPRIS_PROP("HasTrackList", "b", mpris_read_false),
MPRIS_PROP("Identity", "s", mpris_identity),
MPRIS_PROP("SupportedUriSchemes", "as", mpris_uri_schemes),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/options.c new/cmus-2.8.0~20180422.gb595b8c/options.c
--- old/cmus-2.8.0~20171019.g3a4ce9c/options.c 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/options.c 2018-04-22 18:15:30.000000000 +0200
@@ -131,6 +131,7 @@
A_NORMAL,
A_NORMAL,
A_BOLD,
+ A_NORMAL,
};
/* uninitialized option variables */
@@ -1407,6 +1408,7 @@
"color_win_sel_attr",
"color_win_title_attr",
"color_trackwin_album_attr",
+ "color_win_cur_attr",
};
LIST_HEAD(option_head);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/options.h new/cmus-2.8.0~20180422.gb595b8c/options.h
--- old/cmus-2.8.0~20171019.g3a4ce9c/options.h 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/options.h 2018-04-22 18:15:30.000000000 +0200
@@ -112,6 +112,7 @@
COLOR_WIN_SEL_ATTR,
COLOR_WIN_TITLE_ATTR,
COLOR_TRACKWIN_ALBUM_ATTR,
+ COLOR_WIN_CUR_ATTR,
NR_ATTRS
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmus-2.8.0~20171019.g3a4ce9c/ui_curses.c new/cmus-2.8.0~20180422.gb595b8c/ui_curses.c
--- old/cmus-2.8.0~20171019.g3a4ce9c/ui_curses.c 2017-10-19 20:00:06.000000000 +0200
+++ new/cmus-2.8.0~20180422.gb595b8c/ui_curses.c 2018-04-22 18:15:30.000000000 +0200
@@ -227,12 +227,12 @@
static unsigned char cursed_to_attr_idx[NR_CURSED] = {
COLOR_WIN_ATTR,
- COLOR_WIN_ATTR,
+ COLOR_WIN_CUR_ATTR,
COLOR_WIN_INACTIVE_SEL_ATTR,
COLOR_WIN_INACTIVE_CUR_SEL_ATTR,
COLOR_WIN_ATTR,
- COLOR_WIN_ATTR,
+ COLOR_WIN_CUR_ATTR,
COLOR_WIN_SEL_ATTR,
COLOR_WIN_CUR_SEL_ATTR,
@@ -1815,8 +1815,8 @@
argv[i++] = xstrdup(player_status_names[status]);
if (player_info.ti) {
static const char *keys[] = {
- "artist", "album", "discnumber", "tracknumber", "title", "date",
- "musicbrainz_trackid", NULL
+ "artist", "albumartist", "album", "discnumber", "tracknumber", "title",
+ "date", "musicbrainz_trackid", NULL
};
int j;