Changeset 1474:0a0bf0ac011b in roaraudio

Timestamp:

03/30/09 19:34:29 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

only use POSIX file IO if we have POSIX file IO ;)

Location:

libroar

Files:

• file.c (modified) (5 diffs)
• vio.c (modified) (6 diffs)

libroar/file.c

@@ -37 +37 @@
 #define BUFSIZE 8192
 #define BUFMAX  65536
+
+#ifdef ROAR_HAVE_IO_POSIX
+#define _CAN_OPERATE
+#endif
 
 int roar_file_codecdetect(char * buf, int len) {
@@ -83 +87 @@
 
 ssize_t roar_file_send_raw (int out, int in) {
+#ifdef _CAN_OPERATE
  ssize_t r = 0;
 #ifdef ROAR_HAVE_LINUX_SENDFILE
@@ -115 +120 @@
 #endif
  return r;
+#else
+ return -1;
+#endif
 }
 
@@ -185 +193 @@
 
 ssize_t roar_file_play_full  (struct roar_connection * con, char * file, int exec, int passfh, struct roar_stream * s) {
+#ifdef _CAN_OPERATE
  int codec = -1;
  int in, out = -1;
@@ -293 +302 @@
 
  return r;
+#else
+ return -1;
+#endif
 }
 

libroar/vio.c

@@ -35 +35 @@
 #include "libroar.h"
 
+#ifdef ROAR_HAVE_IO_POSIX
+#define _CAN_OPERATE
+#endif
+
 int roar_vio_init_calls (struct roar_vio_calls * calls) {
+#ifdef _CAN_OPERATE
  if ( calls == NULL )
   return -1;
@@ -55 +60 @@
 
  return 0;
+#else
+ return -1;
+#endif
 }
 
@@ -177 +185 @@
 // converters:
 int     roar_vio_open_file     (struct roar_vio_calls * calls, char * filename, int flags, mode_t mode) {
+#ifdef _CAN_OPERATE
  int fh;
 
@@ -191 +200 @@
 
  return 0;
+#else
+ return -1;
+#endif
 }
 
@@ -327 +339 @@
 // basic
 ssize_t roar_vio_basic_read (struct roar_vio_calls * vio, void *buf, size_t count) {
+#ifdef _CAN_OPERATE
  return read(roar_vio_get_fh(vio), buf, count);
+#else
+ return -1;
+#endif
 }
 
 ssize_t roar_vio_basic_write(struct roar_vio_calls * vio, void *buf, size_t count) {
+#ifdef _CAN_OPERATE
  return write(roar_vio_get_fh(vio), buf, count);
+#else
+ return -1;
+#endif
 }
 
 off_t   roar_vio_basic_lseek(struct roar_vio_calls * vio, off_t offset, int whence) {
+#ifdef _CAN_OPERATE
  return lseek(roar_vio_get_fh(vio), offset, whence);
+#else
+ return -1;
+#endif
 }
 
@@ -359 +383 @@
 
 int     roar_vio_basic_close    (struct roar_vio_calls * vio) {
+#ifdef _CAN_OPERATE
  if ( roar_vio_get_fh(vio) != -1 )
   return close(roar_vio_get_fh(vio));
 
  return 0;
+#else
+ return -1;
+#endif
 }