Mercurial > mplayer.hg
view stream/stream_udp.c @ 33526:140525bcc32f
Fix GUI icon bug.
The GUI icon did not display properly but showed up with various distortions.
The reason was the icon mask which hadn't been put to the X server yet when
used.
The icon itself was okay, but is rendered now in a way that doesn't need a
drawable which spares creating a GTK window and destroying it right after.
The locally used GDK variables have been moved inside the function where
they are needed.
Patch with grateful support by Steaphan Greene, sgreene cs.binghamton edu.
This closes Bugzilla #582.
author | ib |
---|---|
date | Tue, 14 Jun 2011 17:51:17 +0000 |
parents | 9494acd724a9 |
children | a93891202051 |
line wrap: on
line source
/* * stream layer for MPEG over UDP, based on previous work from Dave Chapman * * Copyright (C) 2006 Benjamin Zores * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * MPlayer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "config.h" #include <stdlib.h> #include <string.h> #include "network.h" #include "stream.h" #include "url.h" #include "udp.h" static int udp_streaming_start (stream_t *stream) { streaming_ctrl_t *streaming_ctrl; int fd; if (!stream) return -1; streaming_ctrl = stream->streaming_ctrl; fd = stream->fd; if (fd < 0) { fd = udp_open_socket (streaming_ctrl->url); if (fd < 0) return -1; stream->fd = fd; } streaming_ctrl->streaming_read = nop_streaming_read; streaming_ctrl->streaming_seek = nop_streaming_seek; streaming_ctrl->prebuffer_size = 64 * 1024; /* 64 KBytes */ streaming_ctrl->buffering = 0; streaming_ctrl->status = streaming_playing_e; return 0; } static int udp_stream_open (stream_t *stream, int mode, void *opts, int *file_format) { URL_t *url; mp_msg (MSGT_OPEN, MSGL_INFO, "STREAM_UDP, URL: %s\n", stream->url); stream->streaming_ctrl = streaming_ctrl_new (); if (!stream->streaming_ctrl) return STREAM_ERROR; stream->streaming_ctrl->bandwidth = network_bandwidth; url = url_new (stream->url); stream->streaming_ctrl->url = check4proxies (url); if (url->port == 0) { mp_msg (MSGT_NETWORK, MSGL_ERR, "You must enter a port number for UDP streams!\n"); streaming_ctrl_free (stream->streaming_ctrl); stream->streaming_ctrl = NULL; return STREAM_UNSUPPORTED; } if (udp_streaming_start (stream) < 0) { mp_msg (MSGT_NETWORK, MSGL_ERR, "udp_streaming_start failed\n"); streaming_ctrl_free (stream->streaming_ctrl); stream->streaming_ctrl = NULL; return STREAM_UNSUPPORTED; } stream->type = STREAMTYPE_STREAM; fixup_network_stream_cache (stream); return STREAM_OK; } const stream_info_t stream_info_udp = { "MPEG over UDP streaming", "udp", "Dave Chapman, Benjamin Zores", "native udp support", udp_stream_open, { "udp", NULL}, NULL, 0 // Urls are an option string };