Reconcile branches

* cmus/master (cmus/cmus@971204b)
* pgaskin/fix-passwd-docs (a3c8677)
* pgaskin/bracketed-paste (ec4c79c)
* gavtroy/count-albumtracks (gavtroy/cmus@67ff2d9)
* gavtroy/sort-albums-by-date (gavtroy/cmus@b339e82)
* gavtroy/flat-library-view (gavtroy/cmus@7697e0a)
* gavtroy/sorted-album-next (gavtroy/cmus@305cb46)
* gavtroy/fix-unmute-softvol (gavtroy/cmus@b0cbafd)

command_mode.c

@@ -1200,14 +1200,23 @@ static int parse_vol_arg(const char *arg, int *value, unsigned int *flags)
 static void cmd_mute(char *arg)
 {
 	int l = 0, r = 0;
+	int *vl, *vr;
 
-	if (volume_l == 0 && volume_r == 0) {
+	if (soft_vol) {
+		vl = &soft_vol_l;
+		vr = &soft_vol_r;
+	} else {
+		vl = &volume_l;
+		vr = &volume_r;
+	}
+
+	if (*vl == 0 && *vr == 0) {
 		// unmute
 		l = mute_vol_l;
 		r = mute_vol_r;
 	} else {
-		mute_vol_l = volume_l;
-		mute_vol_r = volume_r;
+		mute_vol_l = *vl;
+		mute_vol_r = *vr;
 	}
 
 	int rc = player_set_vol(l, 0, r, 0);

lib.c

@@ -565,7 +565,7 @@ struct track_info *lib_goto_next_album(void)
 		if (play_sorted)
 			track = sorted_album_first_track(track);
 	} else if (play_sorted) {
-		track = sorted_album_last_track(track);
+		track = sorted_album_last_track(lib_cur_track);
 		track = (struct tree_track *)simple_list_get_next(&lib_editable.head,
 				(struct simple_track *)track, aaa_mode_filter, true);
 	} else {
@@ -592,7 +592,7 @@ struct track_info *lib_goto_prev_album(void)
 		else if (track)
 			track = album_first_track(track->album);
 	} else if (play_sorted) {
-		track = sorted_album_first_track(track);
+		track = sorted_album_first_track(lib_cur_track);
 		track = (struct tree_track *)simple_list_get_prev(&lib_editable.head,
 				(struct simple_track *)track, aaa_mode_filter, true);
 		track = sorted_album_first_track(track);