Changeset 1544:9629323e9999 in roaraudio

Timestamp:

04/12/09 19:04:14 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved parts that should be in the header from the c code file into the header file

Location:

roard

Files:

• driver_oss.c (modified) (1 diff)
• include/driver_oss.h (modified) (2 diffs)

roard/driver_oss.c

@@ -26 +26 @@
 #if defined(ROAR_HAVE_OSS_BSD) || defined(ROAR_HAVE_OSS)
 
-struct driver_oss {
- char * device;
- int fh;
- int blocks;
- int blocksize;
- struct roar_audio_info info;
- int need_reopen;
- int need_config;
- struct roar_stream_server * stream;
- int ssid;
-};
 
 #define _get(vio,obj) (((struct driver_oss*)((vio)->inst))->obj)
-
-ssize_t driver_oss_write    (struct roar_vio_calls * vio, void *buf, size_t count);
-int     driver_oss_nonblock (struct roar_vio_calls * vio, int state);
-int     driver_oss_close_vio(struct roar_vio_calls * vio);
-int     driver_oss_reopen_device(struct driver_oss * self);
 
 int driver_oss_init_vio(struct roar_vio_calls * vio, struct driver_oss * inst) {

roard/include/driver_oss.h

@@ -26 +26 @@
 #define _DRIVER_OSS_H_
 
+struct driver_oss {
+ char * device;
+ int fh;
+ int blocks;
+ int blocksize;
+ struct roar_audio_info info;
+ int need_reopen;
+ int need_config;
+ struct roar_stream_server * stream;
+ int ssid;
+};
+
 int driver_oss_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh);
 int driver_oss_close(DRIVER_USERDATA_T   inst);
@@ -31 +43 @@
 int driver_oss_ctl(struct roar_vio_calls * vio, int cmd, void * data);
 
+ssize_t driver_oss_write    (struct roar_vio_calls * vio, void *buf, size_t count);
+int     driver_oss_nonblock (struct roar_vio_calls * vio, int state);
+int     driver_oss_close_vio(struct roar_vio_calls * vio);
+int     driver_oss_reopen_device(struct driver_oss * self);
+
 #endif