Changeset 5221:aa6530a03260 in roaraudio for libroaryiff

Timestamp:

11/12/11 12:25:21 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed old functions from API (Closes: #186)

File:

• libroaryiff/playback.c (modified) (3 diffs)

libroaryiff/playback.c

@@ -36 +36 @@
 #include <libroaryiff.h>
 
+#define BUFFERSIZE  8192
+
+#ifdef ROAR_HAVE_IO_POSIX
+#define _CAN_OPERATE
+#endif
+
 YID YStartPlaySoundObjectSimple (YConnection *con, const char *path) {
  return YStartPlaySoundObject(con, path, NULL);
+}
+
+static inline ssize_t _file_play  (struct roar_connection * con, const char * file, struct roar_stream * s) {
+#ifdef _CAN_OPERATE
+ int codec = -1;
+ int in, out = -1;
+ ssize_t r = 0;
+ int seek;
+ int len;
+ char buf[BUFFERSIZE];
+ int rate = ROAR_RATE_DEFAULT, channels = ROAR_CHANNELS_DEFAULT, bits = ROAR_BITS_DEFAULT;
+
+ // FIXME: check error cases
+
+ ROAR_DBG("roar_file_play_full(*) = ?");
+
+#ifdef ROAR_TARGET_WIN32
+ if ( (in = open(file, O_RDONLY|O_BINARY, 0644)) == -1 ) {
+#else
+ if ( (in = open(file, O_RDONLY, 0644)) == -1 ) {
+#endif
+  roar_err_from_errno();
+  return -1;
+ }
+
+ if ((len = read(in, buf, BUFFERSIZE)) < 1) {
+  roar_err_from_errno();
+  close(in);
+  return -1;
+ }
+
+ codec = roar_file_codecdetect(buf, len);
+
+ ROAR_DBG("roar_file_play_full(*): codec=%i(%s)", codec, roar_codec2str(codec));
+
+ seek = lseek(in, 0, SEEK_SET) == (off_t) -1 ? 0 : 1;
+
+ if ( codec == -1 ) {
+  ROAR_WARN("roar_file_play_full(*): Unknown codec of file: %s", file);
+  close(in);
+  roar_err_set(ROAR_ERROR_BADMAGIC);
+  return -1;
+ }
+
+ if ( !seek ) {
+  ROAR_WARN("roar_file_play_full(*): passfh on non seekable file: this may produce incorrect playback");
+  close(in);
+  roar_err_set(ROAR_ERROR_NOSEEK);
+  return -1;
+ }
+
+ if ( roar_stream_new(s, rate, channels, bits, codec) == -1 ) {
+  close(in);
+  return -1;
+ }
+
+ if ( roar_stream_connect2(con, s, ROAR_DIR_PLAY, -1) == -1 ) {
+  close(in);
+  return -1;
+ }
+
+ if ( roar_stream_passfh(con, s, in) == -1 ) {
+  close(in);
+  roar_kick(con, ROAR_OT_STREAM, roar_stream_get_id(s));
+  return -1;
+ }
+
+ close(out);
+ close(in);
+ return 0;
+
+ return r;
+#else
+ roar_err_set(ROAR_ERROR_NOSYS);
+ return -1;
+#endif
 }
 
@@ -44 +126 @@
  struct roar_stream     stream[1];
 
- if ( !con )
+ if ( con == NULL )
   return YIDNULL;
 
- if ( !path )
+ if ( path == NULL )
   return YIDNULL;
 
@@ -56 +138 @@
  // in background
 
- if ( roar_file_play_full(&rcon, (char*)path, 0, 1, stream) == -1 ) {
+ if ( _file_play(&rcon, path, stream) == -1 ) {
   ROAR_ERR("Can not start playback");
   return YIDNULL;