Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base for custom keys configuration + a few minor fixes

Browse Source
This commit is contained in:
unknown
2008-08-22 16:05:44 +02:00
parent a41afee077
commit 72cb5d8217
6 changed files with 1282 additions and 1186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/helpers.cpp
View File

@@ -61,6 +61,11 @@ extern string UNKNOWN_ARTIST;
extern string UNKNOWN_TITLE;
extern string UNKNOWN_ALBUM;
bool Keypressed(int in, const int *key)
{
return in == key[0] || in == key[1];
}
bool SortSongsByTrack(Song *a, Song *b)
{
return StrToInt(a->GetTrack()) < StrToInt(b->GetTrack());

1
src/helpers.h
View File

@@ -30,6 +30,7 @@
extern ncmpcpp_config Config;
bool Keypressed(int, const int *);
bool SortSongsByTrack(Song *, Song *);
bool CaseInsensitiveComparison(string, string);
void WindowTitle(const string &);

2
src/mpdpp.cpp
View File

@@ -269,7 +269,7 @@ void MPDConnection::GetPlaylistChanges(long long id, SongList &v) const
{
if (isConnected)
{
if (id == -1)
if (id < 0)
{
id = 0;
v.reserve(GetPlaylistLength());

2312
src/ncmpcpp.cpp
View File

File diff suppressed because it is too large Load Diff

98
src/settings.cpp
View File

@@ -24,6 +24,103 @@ const string config_file = home_folder + "/.ncmpcpprc";
using std::ifstream;
void DefaultKeys(ncmpcpp_keys &keys)
{
const int null_key = 0x0fffffff;
keys.Up[0] = KEY_UP;
keys.Down[0] = KEY_DOWN;
keys.PageUp[0] = KEY_PPAGE;
keys.PageDown[0] = KEY_NPAGE;
keys.Home[0] = KEY_HOME;
keys.End[0] = KEY_END;
keys.Space[0] = 32;
keys.Enter[0] = 10;
keys.Delete[0] = KEY_DC;
keys.VolumeUp[0] = KEY_RIGHT;
keys.VolumeDown[0] = KEY_LEFT;
keys.ScreenSwitcher[0] = 9;
keys.Help[0] = '1';
keys.Playlist[0] = '2';
keys.Browser[0] = '3';
keys.SearchEngine[0] = '4';
keys.MediaLibrary[0] = '5';
keys.Stop[0] = 's';
keys.Pause[0] = 'P';
keys.Next[0] = '>';
keys.Prev[0] = '<';
keys.SeekForward[0] = 'f';
keys.SeekBackward[0] = 'b';
keys.ToggleRepeat[0] = 'r';
keys.ToggleRandom[0] = 'z';
keys.Shuffle[0] = 'Z';
keys.ToggleCrossfade[0] = 'x';
keys.SetCrossfade[0] = 'X';
keys.UpdateDB[0] = 'u';
keys.FindForward[0] = '/';
keys.FindBackward[0] = '?';
keys.NextFoundPosition[0] = '.';
keys.PrevFoundPosition[0] = ',';
keys.EditTags[0] = 'e';
keys.GoToPosition[0] = 'g';
keys.Lyrics[0] = 'l';
keys.Clear[0] = 'c';
keys.Crop[0] = 'C';
keys.MvSongUp[0] = 'm';
keys.MvSongDown[0] = 'n';
keys.SavePlaylist[0] = 'S';
keys.GoToNowPlaying[0] = 'o';
keys.ToggleAutoCenter[0] = 'U';
keys.GoToParentDir[0] = 263;
keys.Quit[0] = 'q';
keys.Up[1] = 'k';
keys.Down[1] = 'j';
keys.PageUp[1] = null_key;
keys.PageDown[1] = null_key;
keys.Home[1] = null_key;
keys.End[1] = null_key;
keys.Space[1] = null_key;
keys.Enter[1] = null_key;
keys.Delete[1] = 'd';
keys.VolumeUp[1] = '+';
keys.VolumeDown[1] = '-';
keys.ScreenSwitcher[1] = null_key;
keys.Help[1] = null_key;
keys.Playlist[1] = null_key;
keys.Browser[1] = null_key;
keys.SearchEngine[1] = null_key;
keys.MediaLibrary[1] = null_key;
keys.Stop[1] = null_key;
keys.Pause[1] = null_key;
keys.Next[1] = null_key;
keys.Prev[1] = null_key;
keys.SeekForward[1] = null_key;
keys.SeekBackward[1] = null_key;
keys.ToggleRepeat[1] = null_key;
keys.ToggleRandom[1] = null_key;
keys.Shuffle[1] = null_key;
keys.ToggleCrossfade[1] = null_key;
keys.SetCrossfade[1] = null_key;
keys.UpdateDB[1] = null_key;
keys.FindForward[1] = null_key;
keys.FindBackward[1] = null_key;
keys.NextFoundPosition[1] = null_key;
keys.PrevFoundPosition[1] = null_key;
keys.EditTags[1] = null_key;
keys.GoToPosition[1] = null_key;
keys.Lyrics[1] = null_key;
keys.Clear[1] = null_key;
keys.Crop[1] = null_key;
keys.MvSongUp[1] = null_key;
keys.MvSongDown[1] = null_key;
keys.SavePlaylist[1] = null_key;
keys.GoToNowPlaying[1] = null_key;
keys.ToggleAutoCenter[1] = null_key;
keys.GoToParentDir[1] = 127;
keys.Quit[1] = 'Q';
}
void DefaultConfiguration(ncmpcpp_config &conf)
{
conf.mpd_music_dir = "/var/lib/mpd/music";
@@ -240,3 +337,4 @@ void ReadConfiguration(ncmpcpp_config &conf)
}
}

50
src/settings.h
View File

@@ -25,6 +25,55 @@
#include "ncmpcpp.h"
struct ncmpcpp_keys
{
int Up[2];
int Down[2];
int PageUp[2];
int PageDown[2];
int Home[2];
int End[2];
int Space[2];
int Enter[2];
int Delete[2];
int VolumeUp[2];
int VolumeDown[2];
int ScreenSwitcher[2];
int Help[2];
int Playlist[2];
int Browser[2];
int SearchEngine[2];
int MediaLibrary[2];
int Stop[2];
int Pause[2];
int Next[2];
int Prev[2];
int SeekForward[2];
int SeekBackward[2];
int ToggleRepeat[2];
int ToggleRandom[2];
int Shuffle[2];
int ToggleCrossfade[2];
int SetCrossfade[2];
int UpdateDB[2];
int FindForward[2];
int FindBackward[2];
int NextFoundPosition[2];
int PrevFoundPosition[2];
int EditTags[2];
int GoToPosition[2];
int Lyrics[2];
int Clear[2];
int Crop[2];
int MvSongUp[2];
int MvSongDown[2];
int SavePlaylist[2];
int GoToNowPlaying[2];
int ToggleAutoCenter[2];
int GoToParentDir[2];
int Quit[2];
};
struct ncmpcpp_config
{
string mpd_music_dir;
@@ -57,6 +106,7 @@ struct ncmpcpp_config
int message_delay_time;
};
void DefaultKeys(ncmpcpp_keys &);
void DefaultConfiguration(ncmpcpp_config &);
string GetLineValue(const string &);
string IntoStr(COLOR);