add albums' editor screen (quite experimental for now)

src/helpers.cpp

@@ -188,13 +188,6 @@ bool SortSongsByTrack(Song *a, Song *b)
 	return StrToInt(a->GetTrack()) < StrToInt(b->GetTrack());
 }
 
-bool CaseInsensitiveComparison(string a, string b)
-{
-	transform(a.begin(), a.end(), a.begin(), tolower);
-	transform(b.begin(), b.end(), b.begin(), tolower);
-	return a < b;
-}
-
 void WindowTitle(const string &status)
 {
 	if (TERMINAL_TYPE != "linux" && Config.set_window_title)
@@ -254,6 +247,29 @@ string TotalPlaylistLength()
 	return result;
 }
 
+string DisplayTag(const Song &s, void *data)
+{
+	switch (static_cast<Menu<string> *>(data)->GetChoice())
+	{
+		case 0:
+			return s.GetTitle();
+		case 1:
+			return s.GetArtist();
+		case 2:
+			return s.GetAlbum();
+		case 3:
+			return s.GetYear();
+		case 4:
+			return s.GetTrack();
+		case 5:
+			return s.GetGenre();
+		case 6:
+			return s.GetComment();
+		default:
+			return "";
+	}
+}
+
 string DisplayItem(const Item &item, void *)
 {
 	switch (item.type)
@@ -859,6 +875,30 @@ void ShowMessage(const string &message, int delay)
 	}
 }
 
+#ifdef HAVE_TAGLIB_H
+bool WriteTags(Song &s)
+{
+	string path_to_file = Config.mpd_music_dir + "/" + s.GetFile();
+	TagLib::FileRef f(path_to_file.c_str());
+	if (!f.isNull())
+	{
+		s.GetEmptyFields(1);
+		f.tag()->setTitle(TO_WSTRING(s.GetTitle()));
+		f.tag()->setArtist(TO_WSTRING(s.GetArtist()));
+		f.tag()->setAlbum(TO_WSTRING(s.GetAlbum()));
+		f.tag()->setYear(StrToInt(s.GetYear()));
+		f.tag()->setTrack(StrToInt(s.GetTrack()));
+		f.tag()->setGenre(TO_WSTRING(s.GetGenre()));
+		f.tag()->setComment(TO_WSTRING(s.GetComment()));
+		s.GetEmptyFields(0);
+		f.save();
+		return true;
+	}
+	else
+		return false;
+}
+#endif // HAVE_TAGLIB_H
+
 bool GetSongInfo(Song &s)
 {
 	string path_to_file = Config.mpd_music_dir + "/" + s.GetFile();

src/helpers.h

@@ -30,6 +30,17 @@
 
 extern ncmpcpp_config Config;
 
+class CaseInsensitiveComparison
+{
+	public:
+		bool operator()(string a, string b)
+		{
+			transform(a.begin(), a.end(), a.begin(), tolower);
+			transform(b.begin(), b.end(), b.begin(), tolower);
+			return a < b;
+		}
+};
+
 void UpdateItemList(Menu<Item> *);
 void UpdateSongList(Menu<Song> *);
 void UpdateFoundList(const SongList &, Menu<string> *);
@@ -37,9 +48,10 @@ void UpdateFoundList(const SongList &, Menu<string> *);
 string DisplayKeys(int *, int = 2);
 bool Keypressed(int, const int *);
 bool SortSongsByTrack(Song *, Song *);
-bool CaseInsensitiveComparison(string, string);
+
 void WindowTitle(const string &);
 string TotalPlaylistLength();
+string DisplayTag(const Song &, void *);
 string DisplayItem(const Item &, void * = NULL);
 string DisplayColumns(string);
 string DisplaySongInColumns(const Song &, void *);
@@ -47,6 +59,9 @@ string DisplaySong(const Song &, void * = &Config.song_list_format);
 void ShowMessage(const string &, int = Config.message_delay_time);
 bool SortDirectory(const Item &a, const Item &b);
 void GetDirectory(string, string = "/");
+#ifdef HAVE_TAGLIB_H
+bool WriteTags(Song &);
+#endif
 bool GetSongInfo(Song &);
 void PrepareSearchEngine(Song &s);
 void Search(SongList &, Song &);

src/menu.h

@@ -653,7 +653,11 @@ void Menu<T>::Highlight(int which)
 template <class T>
 void Menu<T>::Reset()
 {
-	NeedsRedraw.clear();
+	if (!Empty())
+	{
+		NeedsRedraw.push_back(0);
+		NeedsRedraw.push_back(itsHighlight);
+	}
 	itsHighlight = 0;
 	itsBeginning = 0;
 }

src/ncmpcpp.cpp

@@ -55,6 +55,13 @@
 			mvvline(main_start_y, lib_albums_start_x-1, 0, main_height); \
 			mPlaylistEditor->Display(redraw_me)
 
+#define REFRESH_ALBUM_EDITOR_SCREEN \
+			mEditorAlbums->Display(redraw_me); \
+			mvvline(main_start_y, lib_albums_start_x-1, 0, main_height); \
+			mEditorTagTypes->Display(redraw_me); \
+			mvvline(main_start_y, lib_songs_start_x-1, 0, main_height); \
+			mEditorTags->Display(redraw_me)
+
 #ifdef HAVE_TAGLIB_H
  const string tag_screen = "Tag editor";
  const string tag_screen_keydesc = "Edit song's tags/playlist's name\n";
@@ -67,22 +74,31 @@ ncmpcpp_config Config;
 ncmpcpp_keys Key;
 
 SongList vSearched;
-std::map<string, string> vAlbums;
+std::map<string, string, CaseInsensitiveComparison> vLibAlbums;
+std::map<string, string, CaseInsensitiveComparison> vEditorAlbums;
 
 vector<int> vFoundPositions;
 int found_pos = 0;
 
 Window *wCurrent = 0;
 Window *wPrev = 0;
+
 Menu<Song> *mPlaylist;
 Menu<Item> *mBrowser;
 Menu<string> *mTagEditor;
 Menu<string> *mSearcher;
+
 Menu<string> *mLibArtists;
 Menu<string> *mLibAlbums;
 Menu<Song> *mLibSongs;
+
+Menu<string> *mEditorAlbums;
+Menu<string> *mEditorTagTypes;
+Menu<Song> *mEditorTags;
+
 Menu<string> *mPlaylistList;
 Menu<Song> *mPlaylistEditor;
+
 Scrollpad *sHelp;
 Scrollpad *sLyrics;
 
@@ -220,6 +236,12 @@ int main(int argc, char *argv[])
 	mLibSongs->SetItemDisplayer(DisplaySong);
 	mLibSongs->SetItemDisplayerUserData(&Config.song_library_format);
 	
+	mEditorAlbums = new Menu<string>(0, main_start_y, lib_artist_width, main_height, "Albums", Config.main_color, brNone);
+	mEditorTagTypes = new Menu<string>(lib_albums_start_x, main_start_y, lib_albums_width, main_height, "Tag types", Config.main_color, brNone);
+	mEditorTags = new Menu<Song>(lib_songs_start_x, main_start_y, lib_songs_width, main_height, "Tags", Config.main_color, brNone);
+	mEditorTags->SetItemDisplayer(DisplayTag);
+	mEditorTags->SetItemDisplayerUserData(mEditorTagTypes);
+	
 	mPlaylistList = new Menu<string>(0, main_start_y, lib_artist_width, main_height, "Playlists", Config.main_color, brNone);
 	mPlaylistEditor = new Menu<Song>(lib_albums_start_x, main_start_y, lib_albums_width+lib_songs_width+1, main_height, "Playlist's content", Config.main_color, brNone);
 	mPlaylistEditor->SetSelectPrefix(Config.selected_item_prefix);
@@ -244,7 +266,8 @@ int main(int argc, char *argv[])
 	sHelp->Add(DisplayKeys(Key.Browser) + "Browse screen\n");
 	sHelp->Add(DisplayKeys(Key.SearchEngine) + "Search engine\n");
 	sHelp->Add(DisplayKeys(Key.MediaLibrary) + "Media library\n");
-	sHelp->Add(DisplayKeys(Key.PlaylistEditor) + "Playlist editor\n\n\n");
+	sHelp->Add(DisplayKeys(Key.PlaylistEditor) + "Playlist editor\n");
+	sHelp->Add(DisplayKeys(Key.AlbumEditor) + "Album editor\n\n\n");
 	
 	sHelp->Add("   [.b]Keys - Global\n -----------------------------------------[/b]\n");
 	sHelp->Add(DisplayKeys(Key.Stop) + "Stop\n");
@@ -354,6 +377,9 @@ int main(int argc, char *argv[])
 	mLibArtists->SetTimeout(ncmpcpp_window_timeout);
 	mLibAlbums->SetTimeout(ncmpcpp_window_timeout);
 	mLibSongs->SetTimeout(ncmpcpp_window_timeout);
+	mEditorAlbums->SetTimeout(ncmpcpp_window_timeout);
+	mEditorTagTypes->SetTimeout(ncmpcpp_window_timeout);
+	mEditorTags->SetTimeout(ncmpcpp_window_timeout);
 	sLyrics->SetTimeout(ncmpcpp_window_timeout);
 	wFooter->SetTimeout(ncmpcpp_window_timeout);
 	mPlaylistList->SetTimeout(ncmpcpp_window_timeout);
@@ -419,6 +445,9 @@ int main(int argc, char *argv[])
 				case csPlaylistEditor:
 					title = "Playlist editor";
 					break;
+				case csAlbumEditor:
+					title = "Albums' tag editor";
+					break;
 			}
 		
 			if (title_allowed)
@@ -456,7 +485,7 @@ int main(int argc, char *argv[])
 				}
 			}
 			else
-				wHeader->WriteXY(0, 0, max_allowed_title_length, "[.b]1:[/b]Help  [.b]2:[/b]Playlist  [.b]3:[/b]Browse  [.b]4:[/b]Search  [.b]5:[/b]Library [.b]6:[/b]Playlist editor", 1);
+				wHeader->WriteXY(0, 0, max_allowed_title_length, "[.b]1:[/b]Help  [.b]2:[/b]Playlist  [.b]3:[/b]Browse  [.b]4:[/b]Search  [.b]5:[/b]Library [.b]6:[/b]Playlist editor [.b]7:[/b]Albums' editor", 1);
 		
 			wHeader->SetColor(Config.volume_color);
 			wHeader->WriteXY(max_allowed_title_length, 0, volume_state);
@@ -475,7 +504,7 @@ int main(int argc, char *argv[])
 				mLibAlbums->Clear(0);
 				mLibSongs->Clear(0);
 				Mpd->GetArtists(list);
-				sort(list.begin(), list.end(), CaseInsensitiveComparison);
+				sort(list.begin(), list.end(), CaseInsensitiveComparison());
 				for (TagList::const_iterator it = list.begin(); it != list.end(); it++)
 					mLibArtists->AddOption(*it);
 				mLibArtists->Window::Clear();
@@ -485,7 +514,7 @@ int main(int argc, char *argv[])
 			if (mLibAlbums->Empty() && mLibSongs->Empty())
 			{
 				mLibAlbums->Reset();
-				vAlbums.clear();
+				vLibAlbums.clear();
 				TagList list;
 				Mpd->GetAlbums(mLibArtists->GetOption(), list);
 				for (TagList::const_iterator it = list.begin(); it != list.end(); it++)
@@ -500,16 +529,16 @@ int main(int argc, char *argv[])
 					{
 						if ((*j)->GetYear() != EMPTY_TAG)
 						{
-							vAlbums["(" + (*j)->GetYear() + ") " + *it] = *it;
+							vLibAlbums["(" + (*j)->GetYear() + ") " + *it] = *it;
 							written = 1;
 							break;
 						}
 					}
 					if (!written)
-						vAlbums[*it] = *it;
+						vLibAlbums[*it] = *it;
 					FreeSongList(l);
 				}
-				for (std::map<string, string>::const_iterator it = vAlbums.begin(); it != vAlbums.end(); it++)
+				for (std::map<string, string>::const_iterator it = vLibAlbums.begin(); it != vLibAlbums.end(); it++)
 					mLibAlbums->AddOption(it->first);
 				mLibAlbums->Window::Clear();
 				mLibAlbums->Refresh();
@@ -539,7 +568,7 @@ int main(int argc, char *argv[])
 					mLibSongs->Clear(0);
 					Mpd->StartSearch(1);
 					Mpd->AddSearch(MPD_TAG_ITEM_ARTIST, mLibArtists->GetOption());
-					Mpd->AddSearch(MPD_TAG_ITEM_ALBUM, vAlbums[mLibAlbums->GetOption()]);
+					Mpd->AddSearch(MPD_TAG_ITEM_ALBUM, vLibAlbums[mLibAlbums->GetOption()]);
 					Mpd->CommitSearch(list);
 				}
 				sort(list.begin(), list.end(), SortSongsByTrack);
@@ -623,6 +652,65 @@ int main(int argc, char *argv[])
 		
 		// playlist editor end
 		
+		// album editor stuff
+		
+		if (current_screen == csAlbumEditor)
+		{
+			if (mEditorAlbums->Empty())
+			{
+				found_pos = 0;
+				vFoundPositions.clear();
+				vEditorAlbums.clear();
+				mEditorAlbums->Window::Clear();
+				mEditorTags->Clear();
+				TagList list;
+				mEditorAlbums->WriteXY(0, 0, "Fetching albums' list...");
+				Mpd->GetAlbums("", list);
+				for (TagList::const_iterator it = list.begin(); it != list.end(); it++)
+				{
+					bool written = 0;
+					SongList l;
+					Mpd->StartSearch(1);
+					Mpd->AddSearch(MPD_TAG_ITEM_ALBUM, *it);
+					Mpd->CommitSearch(l);
+					for (SongList::const_iterator j = l.begin(); j != l.end(); j++)
+					{
+						if ((*j)->GetYear() != EMPTY_TAG)
+						{
+							vEditorAlbums["(" + (*j)->GetYear() + ") " + *it] = *it;
+							written = 1;
+							break;
+						}
+					}
+					if (!written)
+						vEditorAlbums[*it] = *it;
+					FreeSongList(l);
+				}
+				for (std::map<string, string>::const_iterator it = vEditorAlbums.begin(); it != vEditorAlbums.end(); it++)
+					mEditorAlbums->AddOption(it->first);
+				mEditorAlbums->Refresh();
+				mEditorTagTypes->Refresh();
+			}
+			
+			if (mEditorTags->Empty())
+			{
+				mEditorTags->Reset();
+				SongList list;
+				Mpd->StartSearch(1);
+				Mpd->AddSearch(MPD_TAG_ITEM_ALBUM, vEditorAlbums[mEditorAlbums->GetOption()]);
+				Mpd->CommitSearch(list);
+				for (SongList::iterator it = list.begin(); it != list.end(); it++)
+					mEditorTags->AddOption(**it);
+				FreeSongList(list);
+				mEditorTags->Window::Clear();
+				mEditorTags->Refresh();
+			}
+			
+			mEditorTagTypes->GetChoice() < 7 ? mEditorTags->Refresh(1) : mEditorTags->Window::Clear();
+		}
+		
+		// album editor end
+		
 		if (Config.columns_in_playlist && wCurrent == mPlaylist)
 			wCurrent->Display(redraw_me);
 		else
@@ -645,6 +733,8 @@ int main(int argc, char *argv[])
 				browsed_dir_scroll_begin--;
 				break;
 			case csLibrary:
+			case csPlaylistEditor:
+			case csAlbumEditor:
 			{
 				if (Keypressed(input, Key.Up) || Keypressed(input, Key.Down) || Keypressed(input, Key.PageUp) || Keypressed(input, Key.PageDown) || Keypressed(input, Key.Home) || Keypressed(input, Key.End) || Keypressed(input, Key.FindForward) || Keypressed(input, Key.FindBackward) || Keypressed(input, Key.NextFoundPosition) || Keypressed(input, Key.PrevFoundPosition))
 				{
@@ -654,14 +744,20 @@ int main(int argc, char *argv[])
 						mLibSongs->Clear(0);
 					}
 					else if (wCurrent == mLibAlbums)
+					{
 						mLibSongs->Clear(0);
+					}
+					else if (wCurrent == mPlaylistList)
+					{
+						mPlaylistEditor->Clear(0);
+					}
+					else if (wCurrent == mEditorAlbums)
+					{
+						mEditorTags->Clear(0);
+						mEditorTagTypes->Reset();
+						mEditorTagTypes->Refresh();
+					}
 				}
-				break;
-			}
-			case csPlaylistEditor:
-			{
-				if (wCurrent == mPlaylistList && (Keypressed(input, Key.Up) || Keypressed(input, Key.Down) || Keypressed(input, Key.PageUp) || Keypressed(input, Key.PageDown) || Keypressed(input, Key.Home) || Keypressed(input, Key.End) || Keypressed(input, Key.FindForward) || Keypressed(input, Key.FindBackward) || Keypressed(input, Key.NextFoundPosition) || Keypressed(input, Key.PrevFoundPosition)))
-					mPlaylistEditor->Clear(0);
 			}
 			default:
 				break;
@@ -728,10 +824,15 @@ int main(int argc, char *argv[])
 			mLibArtists->Resize(lib_artist_width, main_height);
 			mLibAlbums->Resize(lib_albums_width, main_height);
 			mLibSongs->Resize(lib_songs_width, main_height);
-			
 			mLibAlbums->MoveTo(lib_albums_start_x, main_start_y);
 			mLibSongs->MoveTo(lib_songs_start_x, main_start_y);
 			
+			mEditorAlbums->Resize(lib_artist_width, main_height);
+			mEditorTagTypes->Resize(lib_albums_width, main_height);
+			mEditorTags->Resize(lib_songs_width, main_height);
+			mEditorTagTypes->MoveTo(lib_albums_start_x, main_start_y);
+			mEditorTags->MoveTo(lib_songs_start_x, main_start_y);
+			
 			mPlaylistList->Resize(lib_artist_width, main_height);
 			mPlaylistEditor->Resize(lib_albums_width+lib_songs_width+1, main_height);
 			mPlaylistEditor->MoveTo(lib_albums_start_x, main_start_y);
@@ -754,6 +855,10 @@ int main(int argc, char *argv[])
 			{
 				REFRESH_PLAYLIST_EDITOR_SCREEN;
 			}
+			else if (current_screen == csAlbumEditor)
+			{
+				REFRESH_ALBUM_EDITOR_SCREEN;
+			}
 			header_update_status = 1;
 			PlayerState mpd_state = Mpd->GetState();
 			MPDStatusChanges changes;
@@ -911,21 +1016,9 @@ int main(int argc, char *argv[])
 						}
 						case 8:
 						{
-							string path_to_file = Config.mpd_music_dir + "/" + s.GetFile();
+							ShowMessage("Updating tags...");
-							TagLib::FileRef f(path_to_file.c_str());
+							if (WriteTags(s))
-							if (!f.isNull())
 							{
-								ShowMessage("Updating tags...");
-								s.GetEmptyFields(1);
-								f.tag()->setTitle(TO_WSTRING(s.GetTitle()));
-								f.tag()->setArtist(TO_WSTRING(s.GetArtist()));
-								f.tag()->setAlbum(TO_WSTRING(s.GetAlbum()));
-								f.tag()->setYear(StrToInt(s.GetYear()));
-								f.tag()->setTrack(StrToInt(s.GetTrack()));
-								f.tag()->setGenre(TO_WSTRING(s.GetGenre()));
-								f.tag()->setComment(TO_WSTRING(s.GetComment()));
-								s.GetEmptyFields(0);
-								f.save();
 								ShowMessage("Tags updated!");
 								Mpd->UpdateDirectory(s.GetDirectory());
 								if (prev_screen == csSearcher)
@@ -934,7 +1027,6 @@ int main(int argc, char *argv[])
 									mSearcher->UpdateOption(mSearcher->GetChoice(), DisplaySong(s));
 								}
 							}
-							else
 								ShowMessage("Error writing tags!");
 						}
 						case 9:
@@ -1152,7 +1244,7 @@ int main(int argc, char *argv[])
 							Mpd->QueueAddSong(mLibSongs->at(i));
 						if (Mpd->CommitQueue())
 						{
-							ShowMessage("Adding songs from: " + mLibArtists->GetOption() + " \"" + vAlbums[mLibAlbums->GetOption()] + "\"");
+							ShowMessage("Adding songs from: " + mLibArtists->GetOption() + " \"" + vLibAlbums[mLibAlbums->GetOption()] + "\"");
 							Song *s = &mPlaylist->at(mPlaylist->Size()-mLibSongs->Size());
 							if (s->GetHash() == mLibSongs->at(0).GetHash())
 							{
@@ -1235,6 +1327,93 @@ int main(int argc, char *argv[])
 						wCurrent->Go(wDown);
 					break;
 				}
+#				ifdef HVAE_TAGLIB_H
+				case csAlbumEditor:
+				{
+					void (Song::*set)(const string &) = 0;
+					switch (mEditorTagTypes->GetRealChoice())
+					{
+						case 0:
+							set = &Song::SetTitle;
+							break;
+						case 1:
+							set = &Song::SetArtist;
+							break;
+						case 2:
+							set = &Song::SetAlbum;
+							break;
+						case 3:
+							set = &Song::SetYear;
+							break;
+						case 4:
+							set = &Song::SetTrack;
+							break;
+						case 5:
+							set = &Song::SetGenre;
+							break;
+						case 6:
+							set = &Song::SetComment;
+							break;
+						case 7: // reset
+							mEditorTags->Clear(0);
+							ShowMessage("Changes reset");
+							continue;
+						case 8: // save
+						{
+							bool success = 1;
+							ShowMessage("Writing changes...");
+							for (int i = 0; i < mEditorTags->Size(); i++)
+							{
+								if (!WriteTags(mEditorTags->at(i)))
+								{
+									ShowMessage("Error writing tags!");
+									success = 0;
+									break;
+								}
+							}
+							if (success)
+							{
+								ShowMessage("Tags updated!");
+								mEditorTagTypes->HighlightColor(Config.main_highlight_color);
+								mEditorTagTypes->Reset();
+								wCurrent->Refresh();
+								wCurrent = mEditorAlbums;
+								mEditorAlbums->HighlightColor(Config.active_column_color);
+								Mpd->UpdateDirectory("/");
+							}
+							else
+								mEditorTags->Clear(0);
+							continue;
+						}
+						default:
+							break;
+					}
+					if (wCurrent == mEditorTagTypes)
+					{
+						LOCK_STATUSBAR;
+						wFooter->WriteXY(0, Config.statusbar_visibility, "[.b]" + mEditorTagTypes->GetOption() + "[/b]: ", 1);
+						mEditorTags->at(mEditorTags->GetChoice()).GetEmptyFields(1);
+						string new_tag = wFooter->GetString(mEditorTags->GetOption());
+						mEditorTags->at(mEditorTags->GetChoice()).GetEmptyFields(0);
+						UNLOCK_STATUSBAR;
+						if (!new_tag.empty())
+							for (int i = 0; i < mEditorTags->Size(); i++)
+								(mEditorTags->at(i).*set)(new_tag);
+					}
+					else if (wCurrent == mEditorTags)
+					{
+						LOCK_STATUSBAR;
+						wFooter->WriteXY(0, Config.statusbar_visibility, "[.b]" + mEditorTagTypes->GetOption() + "[/b]: ", 1);
+						mEditorTags->at(mEditorTags->GetChoice()).GetEmptyFields(1);
+						string new_tag = wFooter->GetString(mEditorTags->GetOption());
+						mEditorTags->at(mEditorTags->GetChoice()).GetEmptyFields(0);
+						UNLOCK_STATUSBAR;
+						if (new_tag != mEditorTags->GetOption())
+							(mEditorTags->at(mEditorTags->GetChoice()).*set)(new_tag);
+						mEditorTags->Go(wDown);
+					}
+				}
+#				endif // HAVE_TAGLIB_H
 				default:
 					break;
 			}
@@ -1352,6 +1531,25 @@ int main(int argc, char *argv[])
 				wCurrent = mPlaylistEditor;
 				mPlaylistEditor->HighlightColor(Config.active_column_color);
 			}
+			else if (current_screen == csAlbumEditor && input == Key.VolumeUp[0])
+			{
+				found_pos = 0;
+				vFoundPositions.clear();
+				if (wCurrent == mEditorAlbums)
+				{
+					mEditorAlbums->HighlightColor(Config.main_highlight_color);
+					wCurrent->Refresh();
+					wCurrent = mEditorTagTypes;
+					mEditorTagTypes->HighlightColor(Config.active_column_color);
+				}
+				else if (wCurrent == mEditorTagTypes && mEditorTagTypes->GetChoice() < 7)
+				{
+					mEditorTagTypes->HighlightColor(Config.main_highlight_color);
+					wCurrent->Refresh();
+					wCurrent = mEditorTags;
+					mEditorTags->HighlightColor(Config.active_column_color);
+				}
+			}
 			else
 				Mpd->SetVolume(Mpd->GetVolume()+1);
 		}
@@ -1387,6 +1585,25 @@ int main(int argc, char *argv[])
 				wCurrent = mPlaylistList;
 				mPlaylistList->HighlightColor(Config.active_column_color);
 			}
+			else if (current_screen == csAlbumEditor && input == Key.VolumeDown[0])
+			{
+				found_pos = 0;
+				vFoundPositions.clear();
+				if (wCurrent == mEditorTags)
+				{
+					mEditorTags->HighlightColor(Config.main_highlight_color);
+					wCurrent->Refresh();
+					wCurrent = mEditorTagTypes;
+					mEditorTagTypes->HighlightColor(Config.active_column_color);
+				}
+				else if (wCurrent == mEditorTagTypes)
+				{
+					mEditorTagTypes->HighlightColor(Config.main_highlight_color);
+					wCurrent->Refresh();
+					wCurrent = mEditorAlbums;
+					mEditorAlbums->HighlightColor(Config.active_column_color);
+				}
+			}
 			else
 				Mpd->SetVolume(Mpd->GetVolume()-1);
 		}
@@ -1909,15 +2126,15 @@ int main(int argc, char *argv[])
 			{
 				LOCK_STATUSBAR;
 				wFooter->WriteXY(0, Config.statusbar_visibility, "[.b]Album:[/b] ", 1);
-				string new_album = wFooter->GetString(vAlbums[mLibAlbums->GetOption()]);
+				string new_album = wFooter->GetString(vLibAlbums[mLibAlbums->GetOption()]);
 				UNLOCK_STATUSBAR;
-				if (!new_album.empty() && new_album != vAlbums[mLibAlbums->GetOption()])
+				if (!new_album.empty() && new_album != vLibAlbums[mLibAlbums->GetOption()])
 				{
 					bool success = 1;
 					SongList list;
 					Mpd->StartSearch(1);
 					Mpd->AddSearch(MPD_TAG_ITEM_ARTIST, mLibArtists->GetOption());
-					Mpd->AddSearch(MPD_TAG_ITEM_ALBUM, vAlbums[mLibAlbums->GetOption()]);
+					Mpd->AddSearch(MPD_TAG_ITEM_ALBUM, vLibAlbums[mLibAlbums->GetOption()]);
 					Mpd->CommitSearch(list);
 					for (SongList::const_iterator it = list.begin(); it != list.end(); it++)
 					{
@@ -1941,7 +2158,7 @@ int main(int argc, char *argv[])
 #			endif
 			if ((wCurrent == mPlaylist && !mPlaylist->Empty())
 			||  (wCurrent == mBrowser && mBrowser->at(mBrowser->GetChoice()).type == itSong)
-			||  (wCurrent == mSearcher && !vSearched.empty() && mSearcher->GetChoice() > search_engine_static_option)
+			||  (wCurrent == mSearcher && !vSearched.empty() && mSearcher->GetChoice() >= search_engine_static_option)
 			||  (wCurrent == mLibSongs && !mLibSongs->Empty())
 			||  (wCurrent == mPlaylistEditor && !mPlaylistEditor->Empty()))
 			{
@@ -1994,7 +2211,7 @@ int main(int argc, char *argv[])
 		else if (Keypressed(input, Key.GoToContainingDir))
 		{
 			if ((wCurrent == mPlaylist && !mPlaylist->Empty())
-			|| (wCurrent == mSearcher && !vSearched.empty() && mSearcher->GetChoice() > search_engine_static_option)
+			|| (wCurrent == mSearcher && !vSearched.empty() && mSearcher->GetChoice() >= search_engine_static_option)
 			|| (wCurrent == mLibSongs && !mLibSongs->Empty())
 			|| (wCurrent == mPlaylistEditor && !mPlaylistEditor->Empty()))
 			{
@@ -2404,7 +2621,7 @@ int main(int argc, char *argv[])
 			else if (
 			    (wCurrent == mPlaylist && !mPlaylist->Empty())
 			||  (wCurrent == mBrowser && mBrowser->at(mBrowser->GetChoice()).type == itSong)
-			||  (wCurrent == mSearcher && !vSearched.empty() && mSearcher->GetChoice() > search_engine_static_option)
+			||  (wCurrent == mSearcher && !vSearched.empty() && mSearcher->GetChoice() >= search_engine_static_option)
 			||  (wCurrent == mLibSongs && !mLibSongs->Empty())
 			||  (wCurrent == mPlaylistEditor && !mPlaylistEditor->Empty()))
 			{
@@ -2553,6 +2770,40 @@ int main(int argc, char *argv[])
 				UpdateSongList(mPlaylistEditor);
 			}
 		}
+		else if (Keypressed(input, Key.AlbumEditor))
+		{
+			if (current_screen != csAlbumEditor)
+			{
+				found_pos = 0;
+				vFoundPositions.clear();
+				
+				mEditorAlbums->HighlightColor(Config.active_column_color);
+				mEditorTagTypes->HighlightColor(Config.main_highlight_color);
+				mEditorTags->HighlightColor(Config.main_highlight_color);
+				
+				mPlaylist->Hide(); // hack, should be wCurrent, but it doesn't always have 100% width
+				
+				redraw_me = 1;
+				REFRESH_ALBUM_EDITOR_SCREEN;
+				
+				if (mEditorTagTypes->Empty())
+				{
+					mEditorTagTypes->AddOption("Title");
+					mEditorTagTypes->AddOption("Artist");
+					mEditorTagTypes->AddOption("Album");
+					mEditorTagTypes->AddOption("Year");
+					mEditorTagTypes->AddOption("Track");
+					mEditorTagTypes->AddOption("Genre");
+					mEditorTagTypes->AddOption("Comment");
+					mEditorTagTypes->AddSeparator();
+					mEditorTagTypes->AddOption("Reset");
+					mEditorTagTypes->AddOption("Save");
+				}
+				
+				wCurrent = mEditorAlbums;
+				current_screen = csAlbumEditor;
+			}
+		}
 		else if (Keypressed(input, Key.Quit))
 			main_exit = 1;
 		

src/ncmpcpp.h

@@ -49,7 +49,7 @@ const bool UNICODE = 0;
 #include "scrollpad.h"
 #include "misc.h"
 
-enum NcmpcppScreen { csHelp, csPlaylist, csBrowser, csTagEditor, csSearcher, csLibrary, csLyrics, csPlaylistEditor };
+enum NcmpcppScreen { csHelp, csPlaylist, csBrowser, csTagEditor, csSearcher, csLibrary, csLyrics, csPlaylistEditor, csAlbumEditor };
 
 const int ncmpcpp_window_timeout = 500;
 const int search_engine_static_option = 17;

src/settings.cpp

@@ -45,6 +45,7 @@ void DefaultKeys(ncmpcpp_keys &keys)
 	keys.SearchEngine[0] = '4';
 	keys.MediaLibrary[0] = '5';
 	keys.PlaylistEditor[0] = '6';
+	keys.AlbumEditor[0] = '7';
 	keys.Stop[0] = 's';
 	keys.Pause[0] = 'P';
 	keys.Next[0] = '>';
@@ -102,6 +103,7 @@ void DefaultKeys(ncmpcpp_keys &keys)
 	keys.SearchEngine[1] = 268;
 	keys.MediaLibrary[1] = 269;
 	keys.PlaylistEditor[1] = 270;
+	keys.AlbumEditor[1] = 271;
 	keys.Stop[1] = null_key;
 	keys.Pause[1] = null_key;
 	keys.Next[1] = null_key;

src/settings.h

@@ -47,6 +47,7 @@ struct ncmpcpp_keys
 	int SearchEngine[2];
 	int MediaLibrary[2];
 	int PlaylistEditor[2];
+	int AlbumEditor[2];
 	int Stop[2];
 	int Pause[2];
 	int Next[2];

src/song.h

@@ -62,15 +62,15 @@ class Song
 		int GetPosition() const { return itsPosition; }
 		int GetID() const { return itsID; }
 		
-		void SetFile(string str) { itsFile = str; }
+		void SetFile(const string &str) { itsFile = str; }
-		void SetShortFilename(string str) { itsShortName = str; }
+		void SetShortFilename(const string &str) { itsShortName = str; }
-		void SetArtist(string str) { itsArtist = str; }
+		void SetArtist(const string &str) { itsArtist = str; }
-		void SetTitle(string str) { itsTitle = str; }
+		void SetTitle(const string &str) { itsTitle = str; }
-		void SetAlbum(string str) { itsAlbum = str; }
+		void SetAlbum(const string &str) { itsAlbum = str; }
-		void SetTrack(string str) { itsTrack = str.empty() ? "" : IntoStr(StrToInt(str)); }
+		void SetTrack(const string &str) { itsTrack = str.empty() ? "" : IntoStr(StrToInt(str)); }
-		void SetYear(string str) { itsYear = str.empty() ? "" : IntoStr(StrToInt(str)); }
+		void SetYear(const string &str) { itsYear = str.empty() ? "" : IntoStr(StrToInt(str)); }
-		void SetGenre(string str) { itsGenre = str; }
+		void SetGenre(const string &str) { itsGenre = str; }
-		void SetComment(string str) { itsComment = str; }
+		void SetComment(const string &str) { itsComment = str; }
 		void SetPosition(int pos) { itsPosition = pos; }
 		
 		void GetEmptyFields(bool get) { itsGetEmptyFields = get; }

src/status_checker.cpp

@@ -31,10 +31,10 @@ extern Menu<Item> *mBrowser;
 extern Menu<string> *mSearcher;
 extern Menu<string> *mLibArtists;
 extern Menu<string> *mLibAlbums;
+extern Menu<string> *mEditorAlbums;
 extern Menu<Song> *mLibSongs;
 extern Menu<Song> *mPlaylistEditor;
 
-extern Window *wCurrent;
 extern Window *wHeader;
 extern Window *wFooter;
 
@@ -230,6 +230,7 @@ void NcmpcppStatusChanged(MPDConnection *Mpd, MPDStatusChanges changed, void *da
 		GetDirectory(browsed_dir);
 		mLibArtists->Clear(0);
 		mPlaylistEditor->Clear(0);
+		mEditorAlbums->Clear(0);
 	}
 	if (changed.PlayerState)
 	{
@@ -417,7 +418,8 @@ void NcmpcppStatusChanged(MPDConnection *Mpd, MPDStatusChanges changed, void *da
 		wHeader->WriteXY(wHeader->GetWidth()-volume_state.length(), 0, volume_state);
 		wHeader->SetColor(Config.header_color);
 	}
-	wCurrent->Refresh();
+	if (current_screen == csPlaylist)
+		mPlaylist->Refresh();
 	wFooter->Bold(0);
 	wFooter->GotoXY(sx, sy);
 	wFooter->Refresh();