Updating media content

Making it possible for media to be partially updated, for streaming. Also fixed a problem with multiple concurrent audio players started on a single media item.

4 files changed, 49 insertions, 17 deletions

diff --git a/src/audio/player.c b/src/audio/player.c
index f1d6a2c8..177613bb 100644
--- a/src/audio/player.c
+++ b/src/audio/player.c
@@ -477,10 +477,16 @@ void updateSourceData_Player(iPlayer *d, const iBlock *data, enum iPlayerUpdate
             set_Block(&input->data, data);
             input->isComplete = iFalse;
             break;
-        case append_PlayerUpdate:
-            append_Block(&input->data, data);
+        case append_PlayerUpdate: {
+            const size_t oldSize = size_Block(&input->data);
+            const size_t newSize = size_Block(data);
+            iAssert(newSize >= oldSize);
+            /* The old parts cannot have changed. */
+            iAssert(memcmp(constData_Block(&input->data), constData_Block(data), oldSize) == 0);
+            appendData_Block(&input->data, constBegin_Block(data) + oldSize, newSize - oldSize);
             input->isComplete = iFalse;
             break;
+        }
         case complete_PlayerUpdate:
             input->isComplete = iTrue;
             break;
diff --git a/src/media.c b/src/media.c
index ad0682b1..b72ec32c 100644
--- a/src/media.c
+++ b/src/media.c
@@ -140,21 +140,41 @@ void clear_Media(iMedia *d) {
 }
 
 void setData_Media(iMedia *d, iGmLinkId linkId, const iString *mime, const iBlock *data,
-                   iBool allowHide) {
-    if (!mime || !data) {
-        iMediaId existing = findLinkImage_Media(d, linkId);
-        if (existing) {
+                   int flags) {
+    const iBool isPartial  = (flags & partialData_MediaFlag) != 0;
+    const iBool allowHide  = (flags & allowHide_MediaFlag) != 0;
+    const iBool isDeleting = (!mime || !data);
+    iMediaId    existing   = findLinkImage_Media(d, linkId);
+    if (existing) {
+        if (isDeleting) {
             iGmImage *img;
             take_PtrArray(&d->images, existing - 1, (void **) &img);
             delete_GmImage(img);
         }
-        else if ((existing = findLinkAudio_Media(d, linkId)) != 0) {
-            iGmAudio *audio;
+        else {
+            iAssert(isDeleting); /* images cannot be modified once set */
+        }
+    }
+    else if ((existing = findLinkAudio_Media(d, linkId)) != 0) {
+        iGmAudio *audio;
+        if (isDeleting) {
             take_PtrArray(&d->audio, existing - 1, (void **) &audio);
             delete_GmAudio(audio);
         }
+        else {
+            audio = at_PtrArray(&d->audio, existing - 1);
+            iAssert(equal_String(&audio->props.mime, mime)); /* MIME cannot change */
+            updateSourceData_Player(audio->player, data, append_PlayerUpdate);
+            if (!isStarted_Player(audio->player)) {
+                /* Maybe the previous updates didn't have enough data. */
+                start_Player(audio->player);
+            }
+            if (!isPartial) {
+                updateSourceData_Player(audio->player, NULL, complete_PlayerUpdate);
+            }
+        }
     }
-    else {
+    else if (!isDeleting) {
         if (startsWith_String(mime, "image/")) {
             /* Copy the image to a texture. */
             /* TODO: Resize down to min(maximum texture size, window size). */
@@ -171,13 +191,14 @@ void setData_Media(iMedia *d, iGmLinkId linkId, const iString *mime, const iBloc
         }
         else if (startsWith_String(mime, "audio/")) {
             iGmAudio *audio = new_GmAudio();
-            audio->props.linkId = linkId;
+            audio->props.linkId = linkId; /* TODO: use a hash? */
             audio->props.isPermanent = !allowHide;
             set_String(&audio->props.mime, mime);
-            /* TODO: What about update/complete, for streaming? */
             updateSourceData_Player(audio->player, data, replace_PlayerUpdate);
+            if (!isPartial) {
+                updateSourceData_Player(audio->player, NULL, complete_PlayerUpdate);
+            }
             pushBack_PtrArray(&d->audio, audio);
-
             /* TEST: Start playing right away. */
             start_Player(audio->player);
         }
diff --git a/src/media.h b/src/media.h
index 6f460422..c19ad8ae 100644
--- a/src/media.h
+++ b/src/media.h
@@ -48,8 +48,13 @@ struct Impl_GmAudioInfo {
 iDeclareType(Media)
 iDeclareTypeConstruction(Media)
 
+enum iMediaFlags {
+    allowHide_MediaFlag   = iBit(1),
+    partialData_MediaFlag = iBit(2),
+};
+
 void    clear_Media     (iMedia *);
-void    setData_Media   (iMedia *, uint16_t linkId, const iString *mime, const iBlock *data, iBool allowHide);
+void    setData_Media   (iMedia *, uint16_t linkId, const iString *mime, const iBlock *data, int flags);
 
 iMediaId        findLinkImage_Media (const iMedia *, uint16_t linkId);
 iBool           imageInfo_Media     (const iMedia *, iMediaId imageId, iGmImageInfo *info_out);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index be9da513..165bf9cf 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -742,7 +742,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                                       1,
                                       mimeStr,
                                       &response->body,
-                                      iFalse /* it's fixed */);
+                                      0);
                         redoLayout_GmDocument(d->doc);
                     }
                     else {
@@ -1151,7 +1151,7 @@ static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *
                               req->linkId,
                               meta_GmRequest(req->req),
                               body_GmRequest(req->req),
-                              iTrue);
+                              allowHide_MediaFlag);
                 redoLayout_GmDocument(d->doc);
                 updateVisible_DocumentWidget_(d);
                 invalidate_DocumentWidget_(d);
@@ -1805,7 +1805,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         if (!requestMedia_DocumentWidget_(d, linkId)) {                            
                             if (linkFlags & content_GmLinkFlag) {
                                 /* Dismiss shown content on click. */
-                                setData_Media(media_GmDocument(d->doc), linkId, NULL, NULL, iTrue);
+                                setData_Media(media_GmDocument(d->doc), linkId, NULL, NULL, allowHide_MediaFlag);
                                 redoLayout_GmDocument(d->doc);
                                 d->hoverLink = NULL;
                                 scroll_DocumentWidget_(d, 0);
@@ -1822,7 +1822,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                                   linkId,
                                                   meta_GmRequest(req->req),
                                                   body_GmRequest(req->req),
-                                                  iTrue);
+                                                  allowHide_MediaFlag);
                                     redoLayout_GmDocument(d->doc);
                                     updateVisible_DocumentWidget_(d);
                                     invalidate_DocumentWidget_(d);