Changeset 5221:aa6530a03260 in roaraudio for libroar

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:

• libroar/file.c (modified) (1 diff)

libroar/file.c

@@ -198 +198 @@
 
 
-ssize_t roar_file_play (struct roar_connection * con, char * file, int exec) {
- return roar_file_play_full(con, file, exec, 0, NULL);
-}
-
-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;
- ssize_t r = 0;
- int seek;
- int len;
- char buf[BUFFERSIZE];
- int rate = ROAR_RATE_DEFAULT, channels = ROAR_CHANNELS_DEFAULT, bits = ROAR_BITS_DEFAULT;
- struct roar_stream localstream[1];
-
- // FIXME: check error cases
-
- ROAR_DBG("roar_file_play_full(*) = ?");
-
- if ( s == NULL )
-  s = localstream;
-
- if ( con == NULL ) {
-  roar_err_set(ROAR_ERROR_FAULT);
-  return -1;
- }
-
- if ( file == NULL ) {
-  roar_err_set(ROAR_ERROR_FAULT);
-  return -1;
- }
-
- if ( exec && passfh ) {
-  roar_err_set(ROAR_ERROR_INVAL);
-  return -1;
- }
-
-#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 ( passfh && !seek ) {
-  ROAR_WARN("roar_file_play_full(*): passfh on non seekable file: this may produce incorrect playback");
- }
-
- if ( exec ) {
-  if ( roar_stream_new(s, rate, channels, bits, codec) == -1 ) {
-   ROAR_DBG("roar_file_play_full(*): Can not create new stream. This is realy BAD!");
-   close(in);
-   return -1;
-  }
-
-  if ( roar_stream_connect2(con, s, ROAR_DIR_PLAY, -1) == -1 ) {
-   ROAR_DBG("roar_file_play_full(*): Can not connect new stream to server.");
-   close(in);
-   return -1;
-  }
-
-  if ( roar_stream_exec(con, s) == -1 ) {
-   ROAR_DBG("roar_file_play_full(*): Can not exec new stream on server.");
-   close(in);
-   return -1;
-  }
-
-  roar_libroar_nowarn();
-  if ( (out = roar_get_connection_fh(con)) == -1 ) {
-   ROAR_DBG("roar_file_play_full(*): Can not get socket of server connection for exec data transmition.");
-   close(in);
-   roar_libroar_warn();
-   return -1;
-  }
-  roar_libroar_warn();
-
-  ROAR_SHUTDOWN(out, SHUT_RD);
- } else {
-  if ( !(passfh && seek) ) {
-   if ( (out = roar_simple_new_stream_obj(con, s, rate, channels, bits, codec, ROAR_DIR_PLAY)) == -1 ) {
-    close(in);
-    return -1;
-   }
-  } else {
-   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 ( !seek )
-  ROAR_NETWORK_WRITE(out, buf, len);
-
- if ( !passfh ) {
-#ifndef ROAR_TARGET_WIN32
-  r = roar_file_send_raw(out, in);
-
-  close(out);
-#else
- while ((len = read(in, buf, BUFFERSIZE)) > 0)
-  if ( send(out, buf, len, 0) != len )
-   break;
-
- closesocket(out);
-#endif
-
-  if ( exec ) {
-   // TODO: FIXME: this ma cause a memory leak in future
-   // OLD: con->fh = -1;
-   roar_connect_fh(con, -2);
-  }
-
-  close(in);
- } else {
-  if ( roar_stream_passfh(con, s, in) == -1 ) {
-   return -1;
-  }
-  close(out);
-  close(in);
-  return 0;
- }
-
- return r;
-#else
- roar_err_set(ROAR_ERROR_NOSYS);
- return -1;
-#endif
-}
-
 char  * roar_cdromdevice     (void) {
  char * k;