Changeset 1394:b8703c5336a6 in roaraudio

Timestamp:

03/25/09 16:55:27 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make cdrom support optional

Files:

• configure (modified) (7 diffs)
• libroar/cdrom.c (modified) (6 diffs)

configure

@@ -17 +17 @@
 LDPATH=''
 INCPATH=''
+
+CROSS_COMPILE=false
 
 SYSNAME='unknown'
@@ -31 +33 @@
 PREFIX_MAN=''
 
+CDROM_IS_DEV=true
 CDROM="none"
 OSS_DEV="none"
@@ -144 +147 @@
    echo
    echo '--minimal                   - Disable all optional components'
+   echo '--cross-compile             - Enable cross compiler workarounds'
    echo '--target-win32              - Disable everything useful'
    echo '--exec-helper HELPER        - Exec all test programms using this command (HELPER $cmd $args)'
@@ -279 +283 @@
    shift;
   ;;
+  '--cross-compile')
+   CROSS_COMPILE=true
+  ;;
   '--exec-helper')
    EXEC_HELPER="$2"
@@ -287 +294 @@
    no_lib_dnet=true
    TARGET_WIN32=true
+   CROSS_COMPILE=true
    PROXY=false
    XMMS=false
@@ -867 +875 @@
  echo "$CDROM"
  echo '#define ROAR_DEFAULT_CDROM "'"$CDROM"'"' >&3
+ echo '#define ROAR_HAVE_CDROM' >&3
+elif $CROSS_COMPILE
+then
+ echo 'none (cross compiling, use --cdrom to enable CDROM support)'
 else
  CDROM=$(ls /dev/cdrom /dev/rcd0c 2> /dev/null | head -n 1);
@@ -873 +885 @@
   echo "$CDROM"
   echo '#define ROAR_DEFAULT_CDROM "'"$CDROM"'"' >&3
+  echo '#define ROAR_HAVE_CDROM' >&3
  else
   echo 'none'
+  echo '#define ROAR_HAVE_CDROM' >&3
  fi
 fi

libroar/cdrom.c

@@ -50 +50 @@
 
 pid_t roar_cdrom_run_cdparanoia (int cdrom, int data, int track, char * pos) {
-#if defined(ROAR_HAVE_BIN_CDPARANOIA) && defined(ROAR_CDROM_CDPARANOIA_OUTPUTFORMAT)
+#if defined(ROAR_HAVE_BIN_CDPARANOIA) && defined(ROAR_CDROM_CDPARANOIA_OUTPUTFORMAT) && defined(ROAR_HAVE_CDROM)
  char my_pos[32] = {0};
  pid_t pid;
@@ -111 +111 @@
 
 int roar_cdrom_open (struct roar_connection * con, struct roar_cdrom * cdrom, char * device) {
+#ifdef ROAR_HAVE_CDROM
  int flags;
 
@@ -152 +153 @@
 
  return 0;
+#else
+ return -1;
+#endif
 }
 
 int roar_cdrom_close(struct roar_cdrom * cdrom) {
+#ifdef ROAR_HAVE_CDROM
  if ( cdrom == NULL )
   return -1;
@@ -166 +171 @@
 
  return 0;
+#else
+ return -1;
+#endif
 }
 
 int roar_cdrom_stop (struct roar_cdrom * cdrom) {
+#ifdef ROAR_HAVE_CDROM
  int ret;
 
@@ -197 +206 @@
 
  return ret;
+#else
+ return -1;
+#endif
 }
 
 int roar_cdrom_play (struct roar_cdrom * cdrom, int track) {
+#ifdef ROAR_HAVE_CDROM
  int stream_fh;
  struct roar_stream stream[1];
@@ -232 +245 @@
   return -1;
  }
+#else
+ return -1;
+#endif
 }