diff options
| -rw-r--r-- | libpiano/main.c | 36 | ||||
| -rw-r--r-- | libpiano/piano.h | 2 | ||||
| -rw-r--r-- | src/main.c | 19 |
3 files changed, 52 insertions, 5 deletions
diff --git a/libpiano/main.c b/libpiano/main.c index 52d7a1b..17bef4b 100644 --- a/libpiano/main.c +++ b/libpiano/main.c @@ -84,6 +84,18 @@ void PianoDestroySearchResult (PianoSearchResult_t *searchResult) { } } +/* free single station + * @author PromyLOPh + * @added 2008-06-12 + * @public yes + * @param station + */ +void PianoDestroyStation (PianoStation_t *station) { + free (station->name); + free (station->id); + memset (station, 0, sizeof (station)); +} + /* free complete station list * @author PromyLOPh * @added 2008-06-09 @@ -94,11 +106,9 @@ void PianoDestroyStations (PianoHandle_t *ph) { curStation = ph->stations; while (curStation != NULL) { - free (curStation->name); - free (curStation->id); lastStation = curStation; curStation = curStation->next; - memset (lastStation, 0, sizeof (*lastStation)); + PianoDestroyStation (lastStation); free (lastStation); } ph->stations = NULL; @@ -374,7 +384,25 @@ PianoReturn_t PianoDeleteStation (PianoHandle_t *ph, PianoStation_t *station) { PianoHttpPost (ph->curlHandle, url, requestStr, &retStr); ret = PianoXmlParseSimple (retStr); - /* FIXME would be our job to delete station from global station list... */ + if (ret == PIANO_RET_OK) { + /* delete station from local station list */ + PianoStation_t *curStation = ph->stations, *lastStation = NULL; + while (curStation != NULL) { + if (curStation == station) { + printf ("deleting station\n"); + if (lastStation != NULL) { + lastStation->next = curStation->next; + } else { + /* first station in list */ + ph->stations = curStation->next; + } + PianoDestroyStation (curStation); + free (curStation); + } + lastStation = curStation; + curStation = curStation->next; + } + } free (requestStr); free (retStr); diff --git a/libpiano/piano.h b/libpiano/piano.h index bbe0a9e..9f2f7d7 100644 --- a/libpiano/piano.h +++ b/libpiano/piano.h @@ -145,6 +145,8 @@ void PianoInit (PianoHandle_t *); void PianoDestroy (PianoHandle_t *); void PianoDestroyPlaylist (PianoHandle_t *ph); void PianoDestroySearchResult (PianoSearchResult_t *searchResult); +void PianoDestroyStation (PianoStation_t *station); +void PianoDestroyStations (PianoHandle_t *ph); void PianoConnect (PianoHandle_t *, char *, char *); void PianoGetStations (PianoHandle_t *ph); @@ -274,7 +274,7 @@ int main (int argc, char **argv) { /* in the meantime: wait for user actions */ while (!player.finishedPlayback) { struct pollfd polls = {fileno (stdin), POLLIN, POLLIN}; - char buf; + char buf, yesnoBuf; char *lineBuf; if (poll (&polls, 1, 1000) > 0) { @@ -296,6 +296,23 @@ int main (int argc, char **argv) { PianoDestroyPlaylist (&ph); break; + case 'd': + printf ("Really delete \"%s\"? [yn]\n", + curStation->name); + read (fileno (stdin), &yesnoBuf, sizeof (yesnoBuf)); + if (yesnoBuf == 'y') { + if (PianoDeleteStation (&ph, curStation) == + PIANO_RET_OK) { + player.doQuit = 1; + printf ("Deleted.\n"); + PianoDestroyPlaylist (&ph); + curStation = selectStation (&ph); + } else { + printf ("Error while deleting station.\n"); + } + } + break; + case 'l': if (curSong->rating == PIANO_RATE_LOVE) { printf ("Already loved. No need to do this twice.\n"); |