projects / monky / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Experimental RSS code.
[monky] / src / mpd.c
diff --git a/src/mpd.c b/src/mpd.c
index c21ec01..b9d0a3d 100644 (file)
--- a/src/mpd.c
+++ b/src/mpd.c
@@ -1,3 +1,9 @@
+/*
+ * mpd.c: MPD stuff for Conky
+ *
+ * $Id$
+ */
+
 #include "conky.h"
 #include <stdio.h>
 #include <string.h>
@@ -8,12 +14,18 @@
 void update_mpd()
 {
        struct information *current_info = &info;
-       current_info->conn =
-           mpd_newConnection(current_info->mpd.host,
-                             current_info->mpd.port, 10);
+       if (current_info->conn == NULL) {
+               current_info->conn = mpd_newConnection(current_info->mpd.host, current_info->mpd.port, 10);
+       }
+       if (strlen(current_info->mpd.password) > 1) {
+               mpd_sendPasswordCommand(current_info->conn,
+                                       current_info->mpd.password);
+               mpd_finishCommand(current_info->conn);
+       }
        if (current_info->conn->error) {
-               //fprintf(stderr, "%s\n", current_info->conn->errorStr);
+               //ERR("%MPD error: s\n", current_info->conn->errorStr);
                mpd_closeConnection(current_info->conn);
+               current_info->conn = 0;
                if (current_info->mpd.artist == NULL)
                        current_info->mpd.artist =
                            malloc(TEXT_BUFFER_SIZE);
@@ -21,10 +33,30 @@ void update_mpd()
                        current_info->mpd.album = malloc(TEXT_BUFFER_SIZE);
                if (current_info->mpd.title == NULL)
                        current_info->mpd.title = malloc(TEXT_BUFFER_SIZE);
-               strcpy(current_info->mpd.artist, "Unknown");
-               strcpy(current_info->mpd.album, "Unknown");
-               strcpy(current_info->mpd.title, "Unknown");
-               current_info->mpd.status = "MPD not responding";
+               if (current_info->mpd.random == NULL)
+                       current_info->mpd.random =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.repeat == NULL)
+                       current_info->mpd.repeat =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.track == NULL)
+                       current_info->mpd.track = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.status == NULL)
+                       current_info->mpd.status =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.name == NULL)
+                       current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.file == NULL)
+                       current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
+               *current_info->mpd.name=0;
+               *current_info->mpd.file=0;
+               *current_info->mpd.artist=0;
+               *current_info->mpd.album=0;
+               *current_info->mpd.title=0;
+               *current_info->mpd.random=0;
+               *current_info->mpd.repeat=0;
+               *current_info->mpd.track=0;
+               strncpy(current_info->mpd.status, "MPD not responding", TEXT_BUFFER_SIZE - 1);
                current_info->mpd.bitrate = 0;
                current_info->mpd.progress = 0;
                current_info->mpd.elapsed = 0;
@@ -39,8 +71,9 @@ void update_mpd()
        mpd_sendCurrentSongCommand(current_info->conn);
        mpd_sendCommandListEnd(current_info->conn);
        if ((status = mpd_getStatus(current_info->conn)) == NULL) {
-               //fprintf(stderr, "%s\n", current_info->conn->errorStr);
+               //ERR("MPD error: %s\n", current_info->conn->errorStr);
                mpd_closeConnection(current_info->conn);
+               current_info->conn = 0;
                if (current_info->mpd.artist == NULL)
                        current_info->mpd.artist =
                            malloc(TEXT_BUFFER_SIZE);
@@ -48,10 +81,29 @@ void update_mpd()
                        current_info->mpd.album = malloc(TEXT_BUFFER_SIZE);
                if (current_info->mpd.title == NULL)
                        current_info->mpd.title = malloc(TEXT_BUFFER_SIZE);
-               strcpy(current_info->mpd.artist, "Unknown");
-               strcpy(current_info->mpd.album, "Unknown");
-               strcpy(current_info->mpd.title, "Unknown");
-               current_info->mpd.status = "MPD not responding";
+               if (current_info->mpd.random == NULL)
+                       current_info->mpd.random =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.repeat == NULL)
+                       current_info->mpd.repeat =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.track == NULL)
+                       current_info->mpd.track = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.status == NULL)
+                       current_info->mpd.status = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.name == NULL)
+                       current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.file == NULL)
+                       current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
+               *current_info->mpd.name=0;
+               *current_info->mpd.file=0;
+               *current_info->mpd.artist=0;
+               *current_info->mpd.album=0;
+               *current_info->mpd.title=0;
+               *current_info->mpd.random=0;
+               *current_info->mpd.repeat=0;
+               *current_info->mpd.track=0;
+               strncpy(current_info->mpd.status, "MPD not responding", TEXT_BUFFER_SIZE - 1);
                current_info->mpd.bitrate = 0;
                current_info->mpd.progress = 0;
                current_info->mpd.elapsed = 0;
@@ -63,24 +115,93 @@ void update_mpd()
        //printf("error: %s\n", status->error);
 
        if (status->state == MPD_STATUS_STATE_PLAY) {
-               current_info->mpd.status = "Playing";
+               if (current_info->mpd.status == NULL)
+                       current_info->mpd.status =
+                           malloc(TEXT_BUFFER_SIZE);
+               strncpy(current_info->mpd.status, "Playing",
+                       TEXT_BUFFER_SIZE - 1);
        }
        if (status->state == MPD_STATUS_STATE_STOP) {
-               current_info->mpd.status = "Stopped";
                current_info->mpd.bitrate = 0;
                current_info->mpd.progress = 0;
                current_info->mpd.elapsed = 0;
                current_info->mpd.length = 0;
+               if (current_info->mpd.artist == NULL)
+                       current_info->mpd.artist =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.album == NULL)
+                       current_info->mpd.album = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.title == NULL)
+                       current_info->mpd.title = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.random == NULL)
+                       current_info->mpd.random =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.repeat == NULL)
+                       current_info->mpd.repeat =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.track == NULL)
+                       current_info->mpd.track = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.status == NULL)
+                       current_info->mpd.status =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.name == NULL)
+                       current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.file == NULL)
+                       current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
+               *current_info->mpd.name=0;
+               *current_info->mpd.file=0;
+               *current_info->mpd.artist=0;
+               *current_info->mpd.album=0;
+               *current_info->mpd.title=0;
+               *current_info->mpd.random=0;
+               *current_info->mpd.repeat=0;
+               *current_info->mpd.track=0;
+               strncpy(current_info->mpd.status, "Stopped",
+                       TEXT_BUFFER_SIZE - 1);
        }
        if (status->state == MPD_STATUS_STATE_PAUSE) {
-               current_info->mpd.status = "Paused";
+               if (current_info->mpd.status == NULL)
+                       current_info->mpd.status =
+                           malloc(TEXT_BUFFER_SIZE);
+               strncpy(current_info->mpd.status, "Paused",
+                       TEXT_BUFFER_SIZE - 1);
        }
        if (status->state == MPD_STATUS_STATE_UNKNOWN) {
-               current_info->mpd.status = "Unknown";
                current_info->mpd.bitrate = 0;
                current_info->mpd.progress = 0;
                current_info->mpd.elapsed = 0;
                current_info->mpd.length = 0;
+               if (current_info->mpd.artist == NULL)
+                       current_info->mpd.artist =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.album == NULL)
+                       current_info->mpd.album = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.title == NULL)
+                       current_info->mpd.title = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.random == NULL)
+                       current_info->mpd.random =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.repeat == NULL)
+                       current_info->mpd.repeat =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.track == NULL)
+                       current_info->mpd.track = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.status == NULL)
+                       current_info->mpd.status =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.name == NULL)
+                       current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.file == NULL)
+                       current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
+               *current_info->mpd.name=0;
+               *current_info->mpd.file=0;
+               *current_info->mpd.artist=0;
+               *current_info->mpd.album=0;
+               *current_info->mpd.title=0;
+               *current_info->mpd.random=0;
+               *current_info->mpd.repeat=0;
+               *current_info->mpd.track=0;
+               *current_info->mpd.status=0;
        }
        if (status->state == MPD_STATUS_STATE_PLAY ||
            status->state == MPD_STATUS_STATE_PAUSE) {
@@ -89,12 +210,32 @@ void update_mpd()
                    (float) status->elapsedTime / status->totalTime;
                current_info->mpd.elapsed = status->elapsedTime;
                current_info->mpd.length = status->totalTime;
+               if (current_info->mpd.random == NULL)
+                       current_info->mpd.random =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.repeat == NULL)
+                       current_info->mpd.repeat =
+                           malloc(TEXT_BUFFER_SIZE);
+               if (status->random == 0) {
+                       strcpy(current_info->mpd.random, "Off");
+               } else if (status->random == 1) {
+                       strcpy(current_info->mpd.random, "On");
+               } else {
+                       *current_info->mpd.random=0;
+               }
+               if (status->repeat == 0) {
+                       strcpy(current_info->mpd.repeat, "Off");
+               } else if (status->repeat == 1) {
+                       strcpy(current_info->mpd.repeat, "On");
+               } else {
+                       *current_info->mpd.repeat=0;
+               }
        }
 
-
        if (current_info->conn->error) {
                //fprintf(stderr, "%s\n", current_info->conn->errorStr);
                mpd_closeConnection(current_info->conn);
+               current_info->conn = 0;
                return;
        }
 
@@ -114,32 +255,62 @@ void update_mpd()
                        current_info->mpd.album = malloc(TEXT_BUFFER_SIZE);
                if (current_info->mpd.title == NULL)
                        current_info->mpd.title = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.track == NULL)
+                       current_info->mpd.track = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.name == NULL)
+                       current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+               if (current_info->mpd.file == NULL)
+                       current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
                if (song->artist) {
-                       strcpy(current_info->mpd.artist, song->artist);
+                       strncpy(current_info->mpd.artist, song->artist,
+                               TEXT_BUFFER_SIZE - 1);
                } else {
-                       strcpy(current_info->mpd.artist, "Unknown");
+                       *current_info->mpd.artist=0;
                }
                if (song->album) {
-                       strcpy(current_info->mpd.album, song->album);
+                       strncpy(current_info->mpd.album, song->album,
+                               TEXT_BUFFER_SIZE - 1);
                } else {
-                       strcpy(current_info->mpd.album, "Unknown");
+                       *current_info->mpd.album=0;
                }
                if (song->title) {
-                       strcpy(current_info->mpd.title, song->title);
+                       strncpy(current_info->mpd.title, song->title,
+                               TEXT_BUFFER_SIZE - 1);
+               } else {
+                       *current_info->mpd.title=0;
+               }
+               if (song->track) {
+                       strncpy(current_info->mpd.track, song->track,
+                               TEXT_BUFFER_SIZE - 1);
+               } else {
+                       *current_info->mpd.track=0;
+               }
+               if (song->name) {
+                       strncpy(current_info->mpd.name, song->name,
+                               TEXT_BUFFER_SIZE - 1);
+               } else {
+                       *current_info->mpd.name=0;
+               }
+               if (song->file) {
+                       strncpy(current_info->mpd.file,
+                               song->file, TEXT_BUFFER_SIZE - 1);
                } else {
-                       strcpy(current_info->mpd.title, "Unknown");
+                       *current_info->mpd.file=0;
                }
                if (entity != NULL) {
                        mpd_freeInfoEntity(entity);
+                       entity = NULL;
                }
        }
        if (entity != NULL) {
                mpd_freeInfoEntity(entity);
+               entity = NULL;
        }
 
        if (current_info->conn->error) {
                //fprintf(stderr, "%s\n", current_info->conn->errorStr);
                mpd_closeConnection(current_info->conn);
+               current_info->conn = 0;
                return;
        }
 
@@ -147,8 +318,9 @@ void update_mpd()
        if (current_info->conn->error) {
                //fprintf(stderr, "%s\n", current_info->conn->errorStr);
                mpd_closeConnection(current_info->conn);
+               current_info->conn = 0;
                return;
        }
        mpd_freeStatus(status);
-       mpd_closeConnection(current_info->conn);
+//     mpd_closeConnection(current_info->conn);
 }
Unnamed repository; edit this file to name it for gitweb.