summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/audio_out/audio_oss_out.c13
-rw-r--r--src/input/input_dvd.c8
-rw-r--r--src/input/input_stdin_fifo.c10
-rw-r--r--src/input/input_vcd.c15
-rw-r--r--src/video_out/video_out_syncfb.c10
5 files changed, 51 insertions, 5 deletions
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index 8de699765..8e3ebd1f3 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.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: audio_oss_out.c,v 1.3 2001/04/28 19:47:41 guenter Exp $
+ * $Id: audio_oss_out.c,v 1.4 2001/05/07 02:25:00 f1rmb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -36,6 +36,9 @@
#elif defined(__FreeBSD__)
#include <machine/soundcard.h>
#else
+#if defined(__linux__)
+#include <linux/config.h> /* Check for DEVFS */
+#endif
#include <sys/soundcard.h>
#endif
#include <sys/ioctl.h>
@@ -56,7 +59,11 @@
#define GAP_TOLERANCE 15000
#define MAX_MASTER_CLOCK_DIV 5000
+#ifdef CONFIG_DEVFS_FS
+#define DSP_TEMPLATE "/dev/sound/dsp%d"
+#else
#define DSP_TEMPLATE "/dev/dsp%d"
+#endif
typedef struct oss_functions_s {
@@ -395,7 +402,11 @@ ao_functions_t *init_audio_out_plugin (config_values_t *config) {
oss_functions_t *this;
int caps;
+#ifdef CONFIG_DEVFS_FS
+ char devname[] = "/dev/sound/dsp\0\0\0";
+#else
char devname[] = "/dev/dsp\0\0\0";
+#endif
int best_rate;
int rate ;
int devnum;
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 158ded44f..d7fcc6473 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.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: input_dvd.c,v 1.5 2001/05/07 01:31:44 f1rmb Exp $
+ * $Id: input_dvd.c,v 1.6 2001/05/07 02:25:00 f1rmb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -30,6 +30,7 @@
#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
# include <sys/cdio.h>
#elif defined(__linux__)
+#include <linux/config.h> /* Check for DEVFS */
# include <linux/cdrom.h>
#else
# error "Need the DVD ioctls"
@@ -48,8 +49,13 @@
static uint32_t xine_debug;
+#ifdef CONFIG_DEVFS_FS
+#define DVD "/dev/cdroms/dvd"
+#define RDVD "/dev/cdroms/rdvd"
+#else
#define DVD "/dev/dvd"
#define RDVD "/dev/rdvd"
+#endif
typedef struct {
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index ebe737cc7..f292c065a 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.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: input_stdin_fifo.c,v 1.4 2001/05/07 01:31:44 f1rmb Exp $
+ * $Id: input_stdin_fifo.c,v 1.5 2001/05/07 02:25:00 f1rmb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -32,6 +32,10 @@
#include <sys/stat.h>
#include <errno.h>
+#if defined(__linux__)
+#include <linux/config.h> /* Check for DEVFS */
+#endif
+
#include "xine_internal.h"
#include "monitor.h"
#include "input_plugin.h"
@@ -60,7 +64,11 @@ static int stdin_plugin_open(input_plugin_t *this_gen, char *mrl) {
if(!strncasecmp(mrl, "stdin:", 6)
|| !strncmp(mrl, "-", 1)) {
+#ifdef CONFIG_DEVFS_FS
+ filename = "/dev/vc/stdin";
+#else
filename = "/dev/stdin";
+#endif
}
else if(!strncasecmp(mrl, "fifo:", 5)) {
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 65cfbd9ac..d80b36088 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.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: input_vcd.c,v 1.4 2001/05/07 01:31:44 f1rmb Exp $
+ * $Id: input_vcd.c,v 1.5 2001/05/07 02:25:00 f1rmb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -33,6 +33,7 @@
#include <sys/ioctl.h>
#include <string.h>
#if defined (__linux__)
+#include <linux/config.h> /* Check for DEVFS */
#include <linux/cdrom.h>
#elif defined (__FreeBSD__)
#include <sys/cdio.h>
@@ -48,7 +49,11 @@
static uint32_t xine_debug;
/* for FreeBSD make a link to the right devnode, like /dev/acd0c */
+#ifdef CONFIG_DEVFS_FS
+#define CDROM "/dev/cdroms/cdrom"
+#else
#define CDROM "/dev/cdrom"
+#endif
#define VCDSECTORSIZE 2324
typedef struct {
@@ -673,7 +678,11 @@ static mrl_t **vcd_plugin_get_dir (input_plugin_t *this_gen,
this->fd = open (CDROM, O_RDONLY);
if (this->fd == -1) {
+#ifdef CONFIG_DEVFS_FS
+ perror ("unable to open /dev/cdroms/cdrom");
+#else
perror ("unable to open /dev/cdrom");
+#endi
return NULL;
}
@@ -714,7 +723,11 @@ static char **vcd_plugin_get_autoplay_list (input_plugin_t *this_gen,
this->fd = open (CDROM, O_RDONLY);
if (this->fd == -1) {
+#ifdef CONFIG_DEVFS_FS
+ perror ("unable to open /dev/cdroms/cdrom");
+#else
perror ("unable to open /dev/cdrom");
+#endif
return NULL;
}
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index 2d99f3216..b8262f5db 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.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: video_out_syncfb.c,v 1.1 2001/04/24 20:53:00 f1rmb Exp $
+ * $Id: video_out_syncfb.c,v 1.2 2001/05/07 02:25:00 f1rmb Exp $
*
* video_out_syncfb.c, Matrox G400 video extension interface for xine
*
@@ -49,6 +49,10 @@
#include <X11/Xutil.h>
+#if defined(__linux__)
+#include <linux/config.h> /* Check for DEVFS */
+#endif
+
#include "video_out.h"
#include "video_out_syncfb.h"
@@ -766,7 +770,11 @@ static vo_driver_t vo_mga = {
vo_driver_t *init_video_out_mga () {
+#ifdef CONFIG_DEVFS_FS
+ char name[]= "/dev/fb/syncfb";
+#else
char name[]= "/dev/syncfb";
+#endif
_mga_priv.image_width=720;
_mga_priv.image_height=576;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 13:47:17 +0000