From 32bac776e7c4efe8ff2584fda91f8d1042a86d7e Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Tue, 17 Feb 2009 08:29:40 +0100 Subject: [PATCH] cleaning --- src/browser.cpp | 6 +++--- src/helpers.cpp | 8 -------- src/helpers.h | 2 -- src/media_library.cpp | 12 ++++++++++-- src/media_library.h | 2 ++ src/mpdpp.cpp | 7 ++++--- src/mpdpp.h | 6 ++++++ src/ncmpcpp.cpp | 4 ++-- src/ncmpcpp.h | 25 ------------------------- src/playlist_editor.cpp | 2 +- src/settings.h | 4 +++- 11 files changed, 31 insertions(+), 47 deletions(-) diff --git a/src/browser.cpp b/src/browser.cpp index 032cf762..80ff52a3 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -134,7 +134,7 @@ void Browser::EnterPressed() if (s->GetHash() == list[0]->GetHash()) Mpd->PlayID(s->GetID()); else - ShowMessage("%s", message_part_of_songs_added); + ShowMessage("%s", MPD::Message::PartOfSongsAdded); } FreeSongList(list); break; @@ -178,7 +178,7 @@ void Browser::SpacePressed() ShowMessage("Added folder: %s", item.name.c_str()); Song &s = myPlaylist->Main()->at(myPlaylist->Main()->Size()-list.size()); if (s.GetHash() != list[0]->GetHash()) - ShowMessage("%s", message_part_of_songs_added); + ShowMessage("%s", MPD::Message::PartOfSongsAdded); } FreeSongList(list); break; @@ -224,7 +224,7 @@ void Browser::SpacePressed() ShowMessage("Loading playlist %s...", item.name.c_str()); Song &s = myPlaylist->Main()->at(myPlaylist->Main()->Size()-list.size()); if (s.GetHash() != list[0]->GetHash()) - ShowMessage("%s", message_part_of_songs_added); + ShowMessage("%s", MPD::Message::PartOfSongsAdded); } FreeSongList(list); break; diff --git a/src/helpers.cpp b/src/helpers.cpp index 273f8873..e41c3693 100644 --- a/src/helpers.cpp +++ b/src/helpers.cpp @@ -247,14 +247,6 @@ bool Keypressed(int in, const int *key) return in == key[0] || in == key[1]; } -bool SortSongsByTrack(Song *a, Song *b) -{ - if (a->GetDisc() == b->GetDisc()) - return StrToInt(a->GetTrack()) < StrToInt(b->GetTrack()); - else - return StrToInt(a->GetDisc()) < StrToInt(b->GetDisc()); -} - string FindSharedDir(const string &one, const string &two) { if (one == two) diff --git a/src/helpers.h b/src/helpers.h index 8d5c783a..bec05e97 100644 --- a/src/helpers.h +++ b/src/helpers.h @@ -37,8 +37,6 @@ class CaseInsensitiveSorting bool operator()(const MPD::Item &, const MPD::Item &); }; -bool SortSongsByTrack(MPD::Song *, MPD::Song *); - void UpdateSongList(Menu *); bool Keypressed(int, const int *); diff --git a/src/media_library.cpp b/src/media_library.cpp index d89e5418..63d929e7 100644 --- a/src/media_library.cpp +++ b/src/media_library.cpp @@ -345,7 +345,7 @@ void MediaLibrary::AddToPlaylist(bool add_n_play) Mpd->PlayID(s->GetID()); } else - ShowMessage("%s", message_part_of_songs_added); + ShowMessage("%s", MPD::Message::PartOfSongsAdded); } } else if (w == Albums) @@ -362,7 +362,7 @@ void MediaLibrary::AddToPlaylist(bool add_n_play) Mpd->PlayID(s->GetID()); } else - ShowMessage("%s", message_part_of_songs_added); + ShowMessage("%s", MPD::Message::PartOfSongsAdded); } } else if (w == Songs) @@ -428,3 +428,11 @@ void MediaLibrary::AddToPlaylist(bool add_n_play) } } +bool MediaLibrary::SortSongsByTrack(Song *a, Song *b) +{ + if (a->GetDisc() == b->GetDisc()) + return StrToInt(a->GetTrack()) < StrToInt(b->GetTrack()); + else + return StrToInt(a->GetDisc()) < StrToInt(b->GetDisc()); +} + diff --git a/src/media_library.h b/src/media_library.h index 6d227bcb..ca4b9476 100644 --- a/src/media_library.h +++ b/src/media_library.h @@ -57,6 +57,8 @@ class MediaLibrary : public Screen protected: void AddToPlaylist(bool); + static bool SortSongsByTrack(MPD::Song *, MPD::Song *); + static size_t itsLeftColWidth; static size_t itsMiddleColWidth; static size_t itsMiddleColStartX; diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp index f25dcac2..09272d6b 100644 --- a/src/mpdpp.cpp +++ b/src/mpdpp.cpp @@ -25,7 +25,8 @@ using namespace MPD; using std::string; -const char *playlist_max_message = "playlist is at the max size"; +const char *MPD::Message::PartOfSongsAdded = "Only part of requested songs' list added to playlist!"; +const char *MPD::Message::FullPlaylist = "Playlist is full!"; Connection::Connection() : isConnected(0), itsErrorCode(0), @@ -486,7 +487,7 @@ int Connection::AddSong(const string &path) } else if (itsErrorHandler) - itsErrorHandler(this, MPD_ACK_ERROR_PLAYLIST_MAX, playlist_max_message, NULL); + itsErrorHandler(this, MPD_ACK_ERROR_PLAYLIST_MAX, Message::FullPlaylist, NULL); } return id; } @@ -627,7 +628,7 @@ bool Connection::CommitQueue() mpd_finishCommand(itsConnection); UpdateStatus(); if (GetPlaylistLength() == itsMaxPlaylistLength && itsErrorHandler) - itsErrorHandler(this, MPD_ACK_ERROR_PLAYLIST_MAX, playlist_max_message, NULL); + itsErrorHandler(this, MPD_ACK_ERROR_PLAYLIST_MAX, Message::FullPlaylist, NULL); retval = !itsQueue.empty(); } ClearQueue(); diff --git a/src/mpdpp.h b/src/mpdpp.h index abb604ca..2ef83b02 100644 --- a/src/mpdpp.h +++ b/src/mpdpp.h @@ -28,6 +28,12 @@ namespace MPD { + namespace Message + { + extern const char *PartOfSongsAdded; + extern const char *FullPlaylist; + } + enum QueueCommandType { qctAdd, qctAddToPlaylist, qctDelete, qctDeleteID, qctMove, qctPlaylistMove, qctDeleteFromPlaylist }; enum ItemType { itDirectory, itSong, itPlaylist }; enum PlayerState { psUnknown, psStop, psPlay, psPause }; diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp index 0b0b88bd..6aa9e2db 100644 --- a/src/ncmpcpp.cpp +++ b/src/ncmpcpp.cpp @@ -818,7 +818,7 @@ int main(int argc, char *argv[]) { Song &s = myPlaylist->Main()->at(myPlaylist->Main()->Size()-list.size()); if (s.GetHash() != list[0]->GetHash()) - ShowMessage("%s", message_part_of_songs_added); + ShowMessage("%s", MPD::Message::PartOfSongsAdded); } } else @@ -1275,7 +1275,7 @@ int main(int argc, char *argv[]) ShowMessage("Selected items added!"); Song &s = myPlaylist->Main()->at(myPlaylist->Main()->Size()-result.size()); if (s.GetHash() != result[0]->GetHash()) - ShowMessage("%s", message_part_of_songs_added); + ShowMessage("%s", MPD::Message::PartOfSongsAdded); } } else if (id == 1) diff --git a/src/ncmpcpp.h b/src/ncmpcpp.h index 4ac97ea5..21dcfb15 100644 --- a/src/ncmpcpp.h +++ b/src/ncmpcpp.h @@ -24,7 +24,6 @@ #include "window.h" #include "menu.h" #include "scrollpad.h" -#include "misc.h" #define CLEAR_FIND_HISTORY \ do { \ @@ -34,33 +33,9 @@ typedef std::pair string_pair; -/*enum NcmpcppScreen -{ - myHelp, - myPlaylist, - myBrowser, -# ifdef HAVE_TAGLIB_H - myTinyTagEditor, -# endif // HAVE_TAGLIB_H - myInfo, - mySearcher, - myLibrary, - myLyrics, - myPlaylistEditor, -# ifdef HAVE_TAGLIB_H - myTagEditor, -# endif // HAVE_TAGLIB_H -# ifdef ENABLE_CLOCK - myClock, -# endif // ENABLE_CLOCK - csOther -};*/ - const int ncmpcpp_window_timeout = 500; const std::string home_folder = getenv("HOME") ? getenv("HOME") : ""; -const char * const message_part_of_songs_added = "Only part of requested songs' list added to playlist!"; - #endif diff --git a/src/playlist_editor.cpp b/src/playlist_editor.cpp index c06b9ec2..c2cce404 100644 --- a/src/playlist_editor.cpp +++ b/src/playlist_editor.cpp @@ -204,7 +204,7 @@ void PlaylistEditor::AddToPlaylist(bool add_n_play) Mpd->PlayID(s.GetID()); } else - ShowMessage("%s", message_part_of_songs_added); + ShowMessage("%s", MPD::Message::PartOfSongsAdded); } } else if (w == Content) diff --git a/src/settings.h b/src/settings.h index 74211ac7..e4d46830 100644 --- a/src/settings.h +++ b/src/settings.h @@ -21,11 +21,13 @@ #ifndef _SETTINGS_H #define _SETTINGS_H +#include + #include "libmpdclient.h" #include "ncmpcpp.h" const std::string config_dir = home_folder + "/.ncmpcpp/"; -const int null_key = 0x0fffffff; +const int null_key = std::numeric_limits::max(); struct ncmpcpp_keys {