oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

[CLEANUP] Remove unused code

Browse Source 
Cleanup whitespace->tabs

git-svn-id: https://svn.musicpd.org/mpd/trunk@4347 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Avuton Olrich 2006-07-15 05:04:16 +00:00
parent be006b86ed
commit 3ad41fdda6
3 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/song.c
View File

@ -63,7 +63,7 @@ Song * newSong(char * url, int type, Directory * parentDir) {
assert(type == SONG_TYPE_URL || parentDir); assert(type == SONG_TYPE_URL || parentDir);
if(song->type == SONG_TYPE_FILE) { if(song->type == SONG_TYPE_FILE) {
InputPlugin * plugin; InputPlugin * plugin;
unsigned int next = 0; unsigned int next = 0;
char * song_url = getSongUrl(song); char * song_url = getSongUrl(song);
char * abs_path = rmp2amp(utf8ToFsCharset(song_url)); char * abs_path = rmp2amp(utf8ToFsCharset(song_url));
@ -115,7 +115,7 @@ Song * addSongToList(SongList * list, char * url, char * utf8path,
} }
if(song==NULL) return NULL; if(song==NULL) return NULL;
insertInList(list, song->url, (void *)song); insertInList(list, song->url, (void *)song);
return song; return song;
@ -169,7 +169,7 @@ void writeSongInfoFromList(FILE * fp, SongList * list) {
myfprintf(fp,"%s\n",SONG_END); myfprintf(fp,"%s\n",SONG_END);
} }
void insertSongIntoList(SongList * list, ListNode ** nextSongNode, char * key, static void insertSongIntoList(SongList * list, ListNode ** nextSongNode, char * key,
Song * song) Song * song)
{ {
ListNode * nodeTemp; ListNode * nodeTemp;
@ -266,7 +266,7 @@ void readSongInfoIntoList(FILE * fp, SongList * list, Directory * parentDir) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
if(song) { if(song) {
insertSongIntoList(list, &nextSongNode, song->url, song); insertSongIntoList(list, &nextSongNode, song->url, song);
song = NULL; song = NULL;
@ -281,7 +281,7 @@ void readSongInfoIntoList(FILE * fp, SongList * list, Directory * parentDir) {
int updateSongInfo(Song * song) { int updateSongInfo(Song * song) {
if(song->type == SONG_TYPE_FILE) { if(song->type == SONG_TYPE_FILE) {
InputPlugin * plugin; InputPlugin * plugin;
unsigned int next = 0; unsigned int next = 0;
char * song_url = getSongUrl(song); char * song_url = getSongUrl(song);
char * abs_path = rmp2amp(song_url); char * abs_path = rmp2amp(song_url);
@ -292,26 +292,14 @@ int updateSongInfo(Song * song) {
while(!song->tag && (plugin = isMusic(song_url, while(!song->tag && (plugin = isMusic(song_url,
&(song->mtime), next++))) { &(song->mtime), next++))) {
song->tag = plugin->tagDupFunc(abs_path); song->tag = plugin->tagDupFunc(abs_path);
} }
if(!song->tag || song->tag->time<0) return -1; if(!song->tag || song->tag->time<0) return -1;
} }
return 0; return 0;
} }
Song * songDup(Song * song) {
Song * ret = malloc(sizeof(Song));
ret->url = strdup(song->url);
ret->mtime = song->mtime;
ret->tag = mpdTagDup(song->tag);
ret->type = song->type;
ret->parentDir = song->parentDir;
return ret;
}
/* pass song = NULL to reset, we do this freeJustSong(), so that if /* pass song = NULL to reset, we do this freeJustSong(), so that if
* we free and recreate this memory we make sure to print it correctly*/ * we free and recreate this memory we make sure to print it correctly*/
char * getSongUrl(Song * song) { char * getSongUrl(Song * song) {

2
src/song.h
View File

@ -69,8 +69,6 @@ void readSongInfoIntoList(FILE * fp, SongList * list,
int updateSongInfo(Song * song); int updateSongInfo(Song * song);
Song * songDup(Song * song);
void printSongUrl(FILE * fp, Song * song); void printSongUrl(FILE * fp, Song * song);
char * getSongUrl(Song * song); char * getSongUrl(Song * song);

3
src/stats.c
View File

@ -31,8 +31,6 @@ Stats stats;
void initStats() { void initStats() {
stats.daemonStart = time(NULL); stats.daemonStart = time(NULL);
stats.numberOfSongs = 0; stats.numberOfSongs = 0;
/*stats.playTime = 0;
stats.songsPlayed = 0;*/
} }
int printStats(FILE * fp) { int printStats(FILE * fp) {
@ -42,7 +40,6 @@ int printStats(FILE * fp) {
myfprintf(fp,"uptime: %li\n",time(NULL)-stats.daemonStart); myfprintf(fp,"uptime: %li\n",time(NULL)-stats.daemonStart);
myfprintf(fp,"playtime: %li\n",(long)(getPlayerTotalPlayTime()+0.5)); myfprintf(fp,"playtime: %li\n",(long)(getPlayerTotalPlayTime()+0.5));
myfprintf(fp,"db_playtime: %li\n",stats.dbPlayTime); myfprintf(fp,"db_playtime: %li\n",stats.dbPlayTime);
/*myfprintf(fp,"songs_played: %li\n",stats.songsPlayed);*/
myfprintf(fp,"db_update: %li\n",getDbModTime()); myfprintf(fp,"db_update: %li\n",getDbModTime());
return 0; return 0;
} }