summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/Makefile.am18
-rw-r--r--src/input/input_cdda.c6
-rw-r--r--src/input/input_dvb.c7
-rw-r--r--src/input/input_dvd.c5
-rw-r--r--src/input/input_file.c6
-rw-r--r--src/input/input_pvr.c5
-rw-r--r--src/input/mmsh.c6
7 files changed, 30 insertions, 23 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 071381a67..ff4595f4d 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -80,11 +80,11 @@ xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav)
xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c
-xineplug_inp_net_la_LIBADD = $(XINE_LIB)
+xineplug_inp_net_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
xineplug_inp_net_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_mms_la_SOURCES = input_mms.c net_buf_ctrl.c mms.c mmsh.c http_helper.c
-xineplug_inp_mms_la_LIBADD = $(XINE_LIB) @LIBICONV@
+xineplug_inp_mms_la_LIBADD = $(XINE_LIB) @LIBICONV@ $(THREAD_LIBS)
xineplug_inp_mms_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_vcdo_la_SOURCES = input_vcd.c media_helper.c
@@ -92,27 +92,27 @@ xineplug_inp_vcdo_la_LIBADD = $(XINE_LIB)
xineplug_inp_vcdo_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c net_buf_ctrl.c
-xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB)
+xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
xineplug_inp_stdin_fifo_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_rtp_la_SOURCES = input_rtp.c net_buf_ctrl.c
-xineplug_inp_rtp_la_LIBADD = $(XINE_LIB)
+xineplug_inp_rtp_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
xineplug_inp_rtp_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_http_la_SOURCES = input_http.c net_buf_ctrl.c http_helper.c
-xineplug_inp_http_la_LIBADD = $(XINE_LIB)
+xineplug_inp_http_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
xineplug_inp_http_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_pnm_la_SOURCES = input_pnm.c net_buf_ctrl.c pnm.c
-xineplug_inp_pnm_la_LIBADD = $(XINE_LIB)
+xineplug_inp_pnm_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
xineplug_inp_pnm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_dvb_la_SOURCES = input_dvb.c net_buf_ctrl.c
-xineplug_inp_dvb_la_LIBADD = $(XINE_LIB)
+xineplug_inp_dvb_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
xineplug_inp_dvb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_rtsp_la_SOURCES = input_rtsp.c net_buf_ctrl.c
-xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) libreal/libreal.la librtsp/librtsp.la
+xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS) libreal/libreal.la librtsp/librtsp.la
xineplug_inp_rtsp_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_cdda_la_SOURCES = input_cdda.c media_helper.c sha1.c sha1.h base64.c base64.h
@@ -124,7 +124,7 @@ xineplug_inp_v4l_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB)
xineplug_inp_v4l_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_gnome_vfs_la_SOURCES = input_gnome_vfs.c net_buf_ctrl.c
-xineplug_inp_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(XINE_LIB)
+xineplug_inp_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(XINE_LIB) $(THREAD_LIBS)
xineplug_inp_gnome_vfs_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_smb_la_SOURCES = input_smb.c
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index dcf6e18db..2366225c9 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2004 the xine project
+ * Copyright (C) 2000-2005 the xine project
*
* This file is part of xine, a free video player.
*
@@ -20,7 +20,7 @@
* Compact Disc Digital Audio (CDDA) Input Plugin
* by Mike Melanson (melanson@pcisys.net)
*
- * $Id: input_cdda.c,v 1.73 2005/07/29 19:03:34 jstembridge Exp $
+ * $Id: input_cdda.c,v 1.74 2005/08/25 15:36:29 valtri Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -33,7 +33,9 @@
#include <sys/types.h>
#include <sys/param.h>
+#ifdef HAVE_DIRENT_H
#include <dirent.h>
+#endif
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 7f45d3ab8..f76207671 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -88,7 +88,9 @@
#endif
#include <sys/poll.h>
#include <time.h>
+#ifdef HAVE_DIRENT_H
#include <dirent.h>
+#endif
#include <ctype.h>
/* These will eventually be #include <linux/dvb/...> */
@@ -2098,6 +2100,8 @@ static void do_record (dvb_input_plugin_t *this) {
char dates[64];
int x=0;
xine_cfg_entry_t savedir;
+ DIR *dir;
+
if (this->record_fd > -1) {
/* stop recording */
@@ -2120,10 +2124,11 @@ static void do_record (dvb_input_plugin_t *this) {
if (xine_config_lookup_entry(this->stream->xine, "media.capture.save_dir", &savedir)){
if(strlen(savedir.str_value)>1){
- if(opendir(savedir.str_value)==NULL){
+ if((dir = opendir(savedir.str_value))==NULL){
snprintf (filename, 256, "%s/%s_%s.ts",xine_get_homedir(),this->channels[this->channel].name, dates);
xprintf(this->class->xine,XINE_VERBOSITY_LOG,"savedir is wrong... saving to home directory\n");
} else {
+ closedir(dir);
snprintf (filename, 256, "%s/%s_%s.ts",savedir.str_value,this->channels[this->channel].name, dates);
xprintf(this->class->xine,XINE_VERBOSITY_LOG,"saving to savedir\n");
}
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 52fab4623..527e5a098 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2004 the xine project,
+ * Copyright (C) 2000-2005 the xine project,
* Rich Wareham <richwareham@users.sourceforge.net>
*
* This file is part of xine, a free video player.
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_dvd.c,v 1.201 2005/07/11 11:35:41 hadess Exp $
+ * $Id: input_dvd.c,v 1.202 2005/08/25 15:36:29 valtri Exp $
*
*/
@@ -47,7 +47,6 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <dirent.h>
#include <unistd.h>
#include <fcntl.h>
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 90efb46dc..252bf4b50 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2005 the xine project
*
* This file is part of xine, a free video player.
*
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_file.c,v 1.102 2005/06/21 09:59:49 hadess Exp $
+ * $Id: input_file.c,v 1.103 2005/08/25 15:36:29 valtri Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -26,7 +26,9 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef HAVE_DIRENT_H
#include <dirent.h>
+#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 2b04a3365..545f23777 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2004 the xine project
+ * Copyright (C) 2000-2005 the xine project
* March 2003 - Miguel Freitas
* This plugin was sponsored by 1Control
*
@@ -38,7 +38,7 @@
* usage:
* xine pvr:/<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age>
*
- * $Id: input_pvr.c,v 1.54 2005/02/07 23:58:58 tmattern Exp $
+ * $Id: input_pvr.c,v 1.55 2005/08/25 15:36:29 valtri Exp $
*/
/**************************************************************************
@@ -91,7 +91,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <dirent.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/src/input/mmsh.c b/src/input/mmsh.c
index 62aff01a5..2e2e306ca 100644
--- a/src/input/mmsh.c
+++ b/src/input/mmsh.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: mmsh.c,v 1.34 2005/01/12 00:05:38 tmattern Exp $
+ * $Id: mmsh.c,v 1.35 2005/08/25 15:36:29 valtri Exp $
*
* MMS over HTTP protocol
* written by Thibaut Mattern
@@ -492,8 +492,8 @@ static void interp_header (mmsh_t *this) {
this->packet_length = LE_32(this->asf_header + i + 92 - 24);
this->file_length = LE_64(this->asf_header + i + 40 - 24);
- lprintf ("file object, file_length = %lld, packet length = %d",
- this->file_length, this->packet_count);
+ /*lprintf ("file object, file_length = %lld, packet length = %d",
+ this->file_length, this->packet_count);*/
break;
case GUID_ASF_STREAM_PROPERTIES:
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 22:29:15 +0000