Merge pull request #52 from ajs124/master

Add crossfade support. Not sure about the icon/glyph though
notandy · Mar 3, 2015 · ca40c44 · ca40c44
2 parents 1268cab + 3eb12e6
commit ca40c44
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/htdocs/index.html b/htdocs/index.html
@@ -134,6 +134,9 @@ <h4>
             <button id="btnsingle" type="button" class="btn btn-default">
               <span class="glyphicon glyphicon-star"></span> Single
             </button>
+            <button id="btncrossfade" type="button" class="btn btn-default">
+              <span class="glyphicon glyphicon-link"></span> Crossfade
+            </button>
             <button id="btnrepeat" type="button" class="btn btn-default">
               <span class="glyphicon glyphicon-repeat"></span> Repeat
             </button>

diff --git a/htdocs/js/mpd.js b/htdocs/js/mpd.js
@@ -325,6 +325,11 @@ function webSocketConnect() {
                     else
                         $('#btnsingle').removeClass("active");
 
+                    if(obj.data.crossfade)
+                        $('#btncrossfade').addClass("active")
+                    else
+                        $('#btncrossfade').removeClass("active");
+
                     if(obj.data.repeat)
                         $('#btnrepeat').addClass("active")
                     else
@@ -488,6 +493,9 @@ $('#btnconsume').on('click', function (e) {
 $('#btnsingle').on('click', function (e) {
     socket.send("MPD_API_TOGGLE_SINGLE," + ($(this).hasClass('active') ? 0 : 1));
 });
+$('#btncrossfade').on('click', function(e) {
+    socket.send("MPD_API_TOGGLE_CROSSFADE," + ($(this).hasClass('active') ? 0 : 1));
+});
 $('#btnrepeat').on('click', function (e) {
     socket.send("MPD_API_TOGGLE_REPEAT," + ($(this).hasClass('active') ? 0 : 1));
 });

diff --git a/src/mpd_client.c b/src/mpd_client.c
@@ -102,6 +102,10 @@ int callback_mpd(struct mg_connection *c)
             if(sscanf(c->content, "MPD_API_TOGGLE_SINGLE,%u", &uint_buf))
                 mpd_run_single(mpd.conn, uint_buf);
             break;
+        case MPD_API_TOGGLE_CROSSFADE:
+            if(sscanf(c->content, "MPD_API_TOGGLE_CROSSFADE,%u", &uint_buf))
+                mpd_run_crossfade(mpd.conn, uint_buf);
+            break;
         case MPD_API_SET_VOLUME:
             if(sscanf(c->content, "MPD_API_SET_VOLUME,%ud", &uint_buf) && uint_buf <= 100)
                 mpd_run_set_volume(mpd.conn, uint_buf);
@@ -335,14 +339,15 @@ int mpd_put_state(char *buffer, int *current_song_id, unsigned *queue_version)
     len = snprintf(buffer, MAX_SIZE,
         "{\"type\":\"state\", \"data\":{"
         " \"state\":%d, \"volume\":%d, \"repeat\":%d,"
-        " \"single\":%d, \"consume\":%d, \"random\":%d, "
+        " \"single\":%d, \"crossfade\":%d, \"consume\":%d, \"random\":%d, "
         " \"songpos\": %d, \"elapsedTime\": %d, \"totalTime\":%d, "
         " \"currentsongid\": %d"
         "}}", 
         mpd_status_get_state(status),
         mpd_status_get_volume(status), 
         mpd_status_get_repeat(status),
         mpd_status_get_single(status),
+        mpd_status_get_crossfade(status),
         mpd_status_get_consume(status),
         mpd_status_get_random(status),
         mpd_status_get_song_pos(status),

diff --git a/src/mpd_client.h b/src/mpd_client.h
@@ -60,6 +60,7 @@
     X(MPD_API_TOGGLE_RANDOM) \
     X(MPD_API_TOGGLE_CONSUME) \
     X(MPD_API_TOGGLE_SINGLE) \
+    X(MPD_API_TOGGLE_CROSSFADE) \
     X(MPD_API_TOGGLE_REPEAT)
 
 enum mpd_cmd_ids {