mirror of
https://github.com/albfan/miraclecast.git
synced 2025-03-09 23:38:56 +00:00
cleaning
This commit is contained in:
parent
6a4e9fc084
commit
655d818577
2 changed files with 9 additions and 25 deletions
|
@ -68,7 +68,6 @@ static struct ctl_peer *running_peer;
|
|||
static struct ctl_peer *pending_peer;
|
||||
|
||||
void launch_player(struct ctl_sink *s);
|
||||
void launch_vlc_player(struct ctl_sink *s);
|
||||
|
||||
char *gst_scale_res;
|
||||
int gst_audio_en = 1;
|
||||
|
@ -584,32 +583,20 @@ static void kill_gst(void)
|
|||
if (sink_pid <= 0)
|
||||
return;
|
||||
|
||||
cli_debug("killing vlc_pid 1 : %d", vlc_pid);
|
||||
cli_debug("killing vlc [start]");
|
||||
char *command = "pgrep vlc";
|
||||
cli_debug("killing vlc_pid 2: %d", vlc_pid);
|
||||
cli_debug("killing vlc [using command : pgrep vlc]");
|
||||
FILE* file = popen(command, "r");
|
||||
cli_debug("killing vlc_pid 3: %d", vlc_pid);
|
||||
cli_debug("killing vlc [opening file]");
|
||||
|
||||
while (fscanf(file, "%d", &vlc_pid) != EOF) {
|
||||
cli_debug("killing vlc_pid 4: %d", vlc_pid);
|
||||
cli_debug("killing vlc [pid : %d]", vlc_pid);
|
||||
kill(vlc_pid, SIGTERM);
|
||||
cli_debug("killed vlc [pid : %d]", vlc_pid);
|
||||
}
|
||||
|
||||
pclose(file);
|
||||
|
||||
|
||||
/*
|
||||
argv[i++] = "kill-vlc.sh";
|
||||
argv[i++] = "-c";
|
||||
|
||||
//kill all the vlc players spawned
|
||||
sprintf(command, "ps -x | grep \"rtp://@:%d", rstp_port);
|
||||
argv[i++] = command;
|
||||
|
||||
argv[i] = NULL;
|
||||
|
||||
cli_debug("command used to kill vlc : %s", argv[0]);
|
||||
execvpe(argv[0], argv, environ);*/
|
||||
cli_debug(" Closed file, kill [end]");
|
||||
|
||||
cli_debug("killing pid : %d", sink_pid);
|
||||
kill(sink_pid, SIGTERM);
|
||||
|
@ -630,6 +617,7 @@ void ctl_fn_sink_disconnected(struct ctl_sink *s)
|
|||
} else {
|
||||
cli_notice("SINK disconnected");
|
||||
sink_connected = false;
|
||||
cli_notice("Killing Player...");
|
||||
kill_gst();
|
||||
cli_notice("Killed Player");
|
||||
}
|
||||
|
@ -668,8 +656,8 @@ void ctl_fn_peer_free(struct ctl_peer *p)
|
|||
if (p == running_peer) {
|
||||
cli_printf("no longer running on peer %s\n",
|
||||
running_peer->label);
|
||||
kill_gst();
|
||||
stop_timeout(&sink_timeout);
|
||||
kill_gst();
|
||||
ctl_sink_close(sink);
|
||||
running_peer = NULL;
|
||||
stop_timeout(&scan_timeout);
|
||||
|
|
|
@ -2633,12 +2633,8 @@ static int supplicant_write_config(struct supplicant *s)
|
|||
"p2p_cli_probe=1\n"
|
||||
"p2p_go_intent=0\n"
|
||||
"disable_scan_offload=1\n"
|
||||
"network={\n"
|
||||
"\tssid=\"mrpixel\"\n"
|
||||
"\tpsk=b5ee7c4a2a062bec0aecd029b8218054ce6761873af15a7349730bf5a32e0ba8\n"
|
||||
"}\n"
|
||||
"# End of configuration\n",
|
||||
"DIRECT-AnuragTesting",
|
||||
s->l->friendly_name ?: "uknown",
|
||||
"1-0050F204-1",
|
||||
s->l->config_methods ?: "pbc",
|
||||
"p2p_device=1",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue