Changeset 4293:b3c0ac64bc7d in roaraudio

Timestamp:

08/29/10 03:08:49 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

cleanup

Files:

• include/libroar/ltm.h (modified) (1 diff)
• libroar/ltm.c (modified) (1 diff)

include/libroar/ltm.h

@@ -44 +44 @@
 int roar_ltm_unregister(struct roar_connection * con, int mt, int window, int * streams, size_t slen);
 
-/*
-ssize_t roar_ltm_get_raw(struct roar_connection * con, int mt, int window, int * streams, size_t slen, void * buf, size_t * buflen, int64_t ** array);
-
-int64_t roar_ltm_extract(int64_t * buf, size_t len, int mt, int req);
-int64_t roar_ltm_extract1(int64_t * buf, size_t len, int mt, int req);
-*/
-
 struct roar_ltm_result * roar_ltm_get(struct roar_connection * con, int mt, int window, int * streams, size_t slen, struct roar_ltm_result * oldresult);
 

libroar/ltm.c

@@ -149 +149 @@
 }
 
-/*
-ssize_t roar_ltm_get_raw(struct roar_connection * con,
-                         int mt, int window,
-                         int * streams, size_t slen,
-                         void * buf, size_t * buflen, int64_t ** array) {
- int bits = roar_ltm_numbits(mt);
- int64_t * buffer = buf;
- size_t i;
-
- if ( buflen == NULL ) {
-  roar_errno = ROAR_ERROR_INVAL;
-  return -1;
- }
-
- if ( slen == 0 ) {
-  *buflen = 0;
-  return bits;
- }
-
- if ( con == NULL || streams == NULL || buf == NULL || array == NULL ) {
-  roar_errno = ROAR_ERROR_INVAL;
-  return -1;
- }
-
- if ( *buflen < (bits * slen) ) {
-  roar_errno = ROAR_ERROR_INVAL;
-  return -1;
- }
-
- for (i = 0; i < slen; i++) {
-  array[i] = &(buffer[bits*i]);
- }
-
- roar_errno = ROAR_ERROR_NOSYS;
- return -1;
-}
-
-int64_t roar_ltm_extract(int64_t * buf, size_t len, int mt, int req) {
- int have, need;
-
- roar_err_clear();
-
- have = roar_ltm_numbits(req);
-
- need = roar_ltm_numbits(mt);
-
- if ( have != 1 || (mt & req) != req || len != (size_t)need || buf == NULL ) {
-  roar_errno = ROAR_ERROR_INVAL;
-  return 0;
- }
-
- while (req && (req & 0x1) == 0) {
-  if ( mt & 0x1 )
-   buf++;
-
-  mt  <<= 1;
-  req <<= 1;
- }
-
- return *buf;
-}
-
-int64_t roar_ltm_extract1(int64_t * buf, size_t len, int mt, int req) {
- roar_err_clear();
-
- if ( buf == NULL || len != 1 || mt != req ) {
-  roar_errno = ROAR_ERROR_INVAL;
-  return 0;
- }
-
- return *buf;
-}
-*/
 
 #ifdef DEBUG