Merge branch 'devel' into v19.0.0

jcorporation · Nov 17, 2024 · 5bb790d · 5bb790d
2 parents 1901eec + 8999bfc
commit 5bb790d
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,17 @@ This is a small maintenance release.
 
 ***
 
+## myMPD v18.2.2 (not yet released)
+
+This is a small bug fix release.
+
+### Changelog
+
+- Fix: Parse hh:mm:ss timestamps #1370
+- Fix: Pause streams with known duration #1371
+
+***
+
 ## myMPD v18.2.1 (2024-11-15)
 
 This is a small bug fix release.

diff --git a/contrib/packaging/debian/changelog b/contrib/packaging/debian/changelog
@@ -2,4 +2,4 @@ mympd (19.0.0-1) unstable; urgency=medium
 
   * Release from master
 
- -- Juergen Mang <[email protected]>  Sun, 17 Nov 2024 13:11:21 +0100
+ -- Juergen Mang <[email protected]>  Sun, 17 Nov 2024 13:11:01 +0100
diff --git a/htdocs/js/clickActions.js b/htdocs/js/clickActions.js
@@ -270,10 +270,7 @@ function seekRelative(offset) {
 function clickPlay() {
     switch(currentState.state) {
         case 'play':
-            if (settings.webuiSettings.footerPlaybackControls === 'stop' ||
-                isStreamUri(currentSongObj.uri) === true)
-            {
-                //always stop streams
+            if (settings.webuiSettings.footerPlaybackControls === 'stop') {
                 sendAPI("MYMPD_API_PLAYER_STOP", {}, null, false);
             }
             else {

diff --git a/htdocs/js/utility.js b/htdocs/js/utility.js
@@ -521,15 +521,15 @@ function getMyMPDuri(proto) {
 
 /**
  * Parses a string to seconds
- * @param {string} value [hh:]mm:ss value to parse
+ * @param {string} value [hh:][mm:]ss value to parse
  * @returns {number} value in seconds
  */
 function parseToSeconds(value) {
     let match = value.match(/(\d+):(\d+):(\d+)/);
     if (match) {
         return Number(match[1]) * 60 * 60 +
-            Number(match[1]) * 60 +
-            Number(match[2]);
+            Number(match[2]) * 60 +
+            Number(match[3]);
     }
     match = value.match(/(\d+):(\d+)/);
     if (match) {

diff --git a/htdocs/js/version.js b/htdocs/js/version.js
@@ -1,2 +1,2 @@
 const myMPDversion = '19.0.0';
-const myMPDbuild = '7dfde8348eba03b177de2595369fafa7f22fc254';
+const myMPDbuild = '1901eec73a309801c57453bcce6d3d0c8fea974b';
diff --git a/src/mympd_api/mympd_api_handler.c b/src/mympd_api/mympd_api_handler.c
@@ -739,9 +739,26 @@ void mympd_api_handler(struct t_mympd_state *mympd_state, struct t_partition_sta
             mpd_run_clearerror(partition_state->conn);
             response->data = mympd_respond_with_error_or_ok(partition_state, response->data, request->cmd_id, request->id, "mpd_run_clearerror", &rc);
             break;
+        case MYMPD_API_PLAYER_PLAY:
+            if (mympd_api_status_clear_error(partition_state, &response->data, request->cmd_id, request->id) == false) {
+                break;
+            }
+            mpd_run_play(partition_state->conn);
+            response->data = mympd_respond_with_error_or_ok(partition_state, response->data, request->cmd_id, request->id, "mpd_run_play", &rc);
+            break;
         case MYMPD_API_PLAYER_PAUSE:
-            mpd_run_pause(partition_state->conn, true);
-            response->data = mympd_respond_with_error_or_ok(partition_state, response->data, request->cmd_id, request->id, "mpd_run_pause", &rc);
+        case MYMPD_API_PLAYER_STOP:
+            if (request->cmd_id == MYMPD_API_PLAYER_STOP ||
+                partition_state->song_duration <= 0)
+            {
+                // do not pause streams with unknown duration
+                mpd_run_stop(partition_state->conn);
+                response->data = mympd_respond_with_error_or_ok(partition_state, response->data, request->cmd_id, request->id, "mpd_run_stop", &rc);
+            }
+            else {
+                mpd_run_pause(partition_state->conn, true);
+                response->data = mympd_respond_with_error_or_ok(partition_state, response->data, request->cmd_id, request->id, "mpd_run_pause", &rc);
+            }
             break;
         case MYMPD_API_PLAYER_RESUME:
             if (mympd_api_status_clear_error(partition_state, &response->data, request->cmd_id, request->id) == false) {
@@ -758,17 +775,6 @@ void mympd_api_handler(struct t_mympd_state *mympd_state, struct t_partition_sta
             mpd_run_next(partition_state->conn);
             response->data = mympd_respond_with_error_or_ok(partition_state, response->data, request->cmd_id, request->id, "mpd_run_next", &rc);
             break;
-        case MYMPD_API_PLAYER_PLAY:
-            if (mympd_api_status_clear_error(partition_state, &response->data, request->cmd_id, request->id) == false) {
-                break;
-            }
-            mpd_run_play(partition_state->conn);
-            response->data = mympd_respond_with_error_or_ok(partition_state, response->data, request->cmd_id, request->id, "mpd_run_play", &rc);
-            break;
-        case MYMPD_API_PLAYER_STOP:
-            mpd_run_stop(partition_state->conn);
-            response->data = mympd_respond_with_error_or_ok(partition_state, response->data, request->cmd_id, request->id, "mpd_run_stop", &rc);
-            break;
         case MYMPD_API_PLAYER_PLAY_SONG:
             if (json_get_uint_max(request->data, "$.params.songId", &uint_buf1, &parse_error) == true) {
                 mpd_run_play_id(partition_state->conn, uint_buf1);