Changeset 5223:3326fb359ffe in roaraudio for libroar/file.c

Timestamp:

11/12/11 12:44:52 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed roar_file_send_raw() and roarcatsendfile.

File:

• libroar/file.c (modified) (2 diffs)

libroar/file.c

@@ -35 +35 @@
 
 #include "libroar.h"
-
-#define BUFFERSIZE  8192
-#define BUFMAX     65536
-
-#ifdef ROAR_HAVE_IO_POSIX
-#define _CAN_OPERATE
-#endif
 
 int roar_file_codecdetect(char * buf, int len) {
@@ -90 +83 @@
 }
 
-ssize_t roar_file_send_raw (int out, int in) {
-#ifdef _CAN_OPERATE
- ssize_t r = 0;
-#ifdef ROAR_HAVE_LINUX_SENDFILE
- ssize_t ret;
-#endif
- int len;
- char buf[BUFFERSIZE];
-#if defined(__linux__) && defined(ROAR_HAVE_IPV4)
- int cork_new = 1, cork_old;
- socklen_t cork_len = sizeof(int);
-
- if ( getsockopt(out, IPPROTO_TCP, TCP_CORK, &cork_old, &cork_len) == -1 ) {
-  cork_old = -1;
- } else {
-  setsockopt(out, IPPROTO_TCP, TCP_CORK, &cork_new, sizeof(int));
- }
-#endif
-
- roar_debug_warn_obsolete("roar_file_send_raw", "roar_vio_copy_data", NULL);
-
-#ifdef ROAR_HAVE_LINUX_SENDFILE
- while ((ret = sendfile(out, in, NULL, BUFMAX)) > 0)
-  r += ret;
-#endif
-
- // TODO: try mmap here!
-
- while ((len = read(in, buf, BUFFERSIZE)) > 0)
-  r += write(out, buf, len);
-
-#if defined(__linux__) && defined(ROAR_HAVE_IPV4)
- if ( cork_old != -1 )
-  setsockopt(out, IPPROTO_TCP, TCP_CORK, &cork_old, cork_len);
-#endif
- return r;
-#else
- return -1;
-#endif
-}
-
 char  * roar_cdromdevice     (void) {
  char * k;