summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-03-09 11:27:46 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-03-15 00:00:04 -0700
commit03791fae163591951b2b8208fe6b0b6c95d8ae77 (patch)
tree59d671ffdbe345d0ffce209abadc797e6d968ef9
parent4d9c6ab6b9b9c5436f5ee52f56aee304da4b20b1 (diff)
downloadmpv-03791fae163591951b2b8208fe6b0b6c95d8ae77.tar.bz2
mpv-03791fae163591951b2b8208fe6b0b6c95d8ae77.tar.xz
all: replace mpv_detach_destroy() with mpv_destroy()
-rw-r--r--input/ipc-unix.c4
-rw-r--r--input/ipc-win.c4
-rw-r--r--osdep/macosx_events.m4
-rw-r--r--player/scripting.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/input/ipc-unix.c b/input/ipc-unix.c
index 3b01d477f1..778f2f1e46 100644
--- a/input/ipc-unix.c
+++ b/input/ipc-unix.c
@@ -209,7 +209,7 @@ done:
talloc_free(client_msg.start);
if (arg->close_client_fd)
close(arg->client_fd);
- mpv_detach_destroy(arg->client);
+ mpv_destroy(arg->client);
talloc_free(arg);
return NULL;
}
@@ -230,7 +230,7 @@ static void ipc_start_client(struct mp_ipc_ctx *ctx, struct client_arg *client)
err:
if (client->client)
- mpv_detach_destroy(client->client);
+ mpv_destroy(client->client);
if (client->close_client_fd)
close(client->client_fd);
diff --git a/input/ipc-win.c b/input/ipc-win.c
index 6908683d8d..3cbdad3749 100644
--- a/input/ipc-win.c
+++ b/input/ipc-win.c
@@ -304,7 +304,7 @@ done:
CloseHandle(arg->write_ol.hEvent);
CloseHandle(arg->client_h);
- mpv_detach_destroy(arg->client);
+ mpv_destroy(arg->client);
talloc_free(arg);
return NULL;
}
@@ -316,7 +316,7 @@ static void ipc_start_client(struct mp_ipc_ctx *ctx, struct client_arg *client)
pthread_t client_thr;
if (pthread_create(&client_thr, NULL, client_thread, client)) {
- mpv_detach_destroy(client->client);
+ mpv_destroy(client->client);
CloseHandle(client->client_h);
talloc_free(client);
}
diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m
index fef7e95053..0d46c0e906 100644
--- a/osdep/macosx_events.m
+++ b/osdep/macosx_events.m
@@ -314,7 +314,7 @@ void cocoa_set_mpv_handle(struct mpv_handle *ctx)
});
return YES;
} else {
- mpv_detach_destroy(ctx);
+ mpv_destroy(ctx);
return NO;
}
}
@@ -343,7 +343,7 @@ void cocoa_set_mpv_handle(struct mpv_handle *ctx)
if ([(Application *)NSApp cocoaCB].isShuttingDown)
return;
#endif
- mpv_detach_destroy(_ctx);
+ mpv_destroy(_ctx);
_ctx = nil;
break;
}
diff --git a/player/scripting.c b/player/scripting.c
index 0838630bed..9d2cd97de5 100644
--- a/player/scripting.c
+++ b/player/scripting.c
@@ -95,7 +95,7 @@ static void *script_thread(void *p)
if (arg->backend->load(arg->client, arg->fname) < 0)
MP_ERR(arg, "Could not load %s %s\n", arg->backend->name, arg->fname);
- mpv_detach_destroy(arg->client);
+ mpv_destroy(arg->client);
talloc_free(arg);
return NULL;
}
@@ -145,7 +145,7 @@ static int mp_load_script(struct MPContext *mpctx, const char *fname)
pthread_t thread;
if (pthread_create(&thread, NULL, script_thread, arg)) {
- mpv_detach_destroy(arg->client);
+ mpv_destroy(arg->client);
talloc_free(arg);
return -1;
}