call undomanager_flush on any playlist changes

Author: Oleksiy-Yakovenko

include/deadbeef/deadbeef.h

@@ -1710,8 +1710,6 @@ typedef struct {
     /// Please ensure that this function is not called from within @c pl_lock,
     /// since this function internally uses streamer_lock, which may cause a deadlock against pl_lock.
     ddb_playItem_t * (*streamer_get_playing_track_safe) (void);
-
-    void (*runloop_end)(void);
 #endif
 } DB_functions_t;
 

plugins/cocoaui/Playlist/PlaylistContentView.m

@@ -182,7 +182,6 @@ - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
             [self.delegate dropItems:(int)from_playlist before:row indices:indices count:(int)length copy:op==NSDragOperationCopy];
             free(indices);
         }
-        deadbeef->runloop_end();
    }
     if ([pboard.types containsObject:ddbMedialibItemUTIType]) {
         NSArray *classes = @[[MedialibItemDragDropHolder class]];
@@ -203,22 +202,19 @@ - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
         }
         [self.delegate dropPlayItems:items before:row count:(int)itemCount];
         free (items);
-        deadbeef->runloop_end();
     }
     else if ([pboard.types containsObject:NSFilenamesPboardType]) {
 
         NSArray *paths = [pboard propertyListForType:NSFilenamesPboardType];
         if (row != (self.dataModel).invalidRow) {
             // add before selected row
             [self.delegate externalDropItems:paths after: [self.dataModel rowForIndex:sel-1] completionBlock:^{
-                deadbeef->runloop_end();
             }];
         }
         else {
             // no selected row, add to end
             DdbListviewRow_t lastRow = [self.dataModel rowForIndex:((self.dataModel).rowCount-1)];
             [self.delegate externalDropItems:paths after:lastRow completionBlock:^{
-                deadbeef->runloop_end();
             }];
         }
     }
@@ -1035,7 +1031,6 @@ - (void)keyDown:(NSEvent *)theEvent {
             break;
         default:
             [super keyDown:theEvent];
-            deadbeef->runloop_end();
             return;
         }
 

src/main.c

@@ -28,6 +28,7 @@
 #    include <config.h>
 #endif
 #include <assert.h>
+#include <dispatch/dispatch.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
@@ -951,6 +952,10 @@ player_mainloop (void) {
                         streamer_notify_track_deleted ();
                         break;
                     }
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        undomanager_flush(undomanager_shared(), "Some Action");
+                    });
+                    // fallthrough
                 case DB_EV_PAUSED:
                 case DB_EV_SONGFINISHED:
                     save_resume_state ();

src/plugins.c

@@ -142,11 +142,6 @@ static void
 _viz_spectrum_listen_stub (void *ctx, void (*callback)(void *ctx, const ddb_audio_data_t *data)) {
 }
 
-static void
-runloop_end(void) {
-    undomanager_flush(undomanager_shared(), "Some Action");
-}
-
 // deadbeef api
 static DB_functions_t deadbeef_api = {
     .vmajor = DB_API_VERSION_MAJOR,
@@ -539,7 +534,6 @@ static DB_functions_t deadbeef_api = {
     .plt_insert_dir3 = (ddb_playItem_t *(*) (int visibility, uint32_t flags, ddb_playlist_t *plt, ddb_playItem_t *after, const char *dirname, int *pabort, int (*callback)(ddb_insert_file_result_t result, const char *fname, void *user_data), void *user_data))plt_insert_dir3,
 
     .streamer_get_playing_track_safe = (DB_playItem_t *(*) (void))streamer_get_playing_track,
-    .runloop_end = runloop_end,
 };
 
 DB_functions_t *deadbeef = &deadbeef_api;