[xiph-cvs] cvs commit: ao/src/plugins/sun ao_sun.c
Stan Seibert
volsung at xiph.org
Mon Jul 23 17:08:07 PDT 2001
volsung 01/07/23 17:08:07
Modified: doc Tag: volsung_20010721 plugin-api.html
include/ao Tag: volsung_20010721 plugin.h
src Tag: volsung_20010721 audio_out.c
src/plugins/alsa Tag: volsung_20010721 ao_alsa.c
src/plugins/arts Tag: volsung_20010721 Makefile.am ao_arts.c
src/plugins/esd Tag: volsung_20010721 ao_esd.c
src/plugins/irix Tag: volsung_20010721 ao_irix.c
src/plugins/oss Tag: volsung_20010721 ao_oss.c
src/plugins/sun Tag: volsung_20010721 ao_sun.c
Added: doc Tag: volsung_20010721 ao_plugin_close.html
ao_plugin_device_clear.html
ao_plugin_device_init.html
ao_plugin_driver_info.html ao_plugin_open.html
ao_plugin_play.html ao_plugin_set_option.html
ao_plugin_test.html
Removed: doc Tag: volsung_20010721 plugin_close.html
plugin_device_clear.html plugin_device_init.html
plugin_driver_info.html plugin_open.html
plugin_play.html plugin_set_option.html
plugin_test.html
Log:
Changed the plugin_*() functions to ao_plugin_*() functions for
consistency.
Revision Changes Path
No revision
No revision
1.1.2.2 +8 -8 ao/doc/Attic/plugin-api.html
Index: plugin-api.html
===================================================================
RCS file: /usr/local/cvsroot/ao/doc/Attic/plugin-api.html,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- plugin-api.html 2001/07/22 03:35:41 1.1.2.1
+++ plugin-api.html 2001/07/24 00:08:00 1.1.2.2
@@ -16,14 +16,14 @@
<h1>Plugin API</h1>
<p>
-<a href="plugin_test.html">plugin_test()</a><br>
-<a href="plugin_driver_info.html">plugin_driver_info()</a><br>
-<a href="plugin_device_init.html">plugin_device_init()</a><br>
-<a href="plugin_set_option.html">plugin_set_option()</a><br>
-<a href="plugin_open.html">plugin_open()</a><br>
-<a href="plugin_play.html">plugin_play()</a><br>
-<a href="plugin_close.html">plugin_close()</a><br>
-<a href="plugin_device_clear.html">plugin_device_clear()</a><br>
+<a href="ao_plugin_test.html">ao_plugin_test()</a><br>
+<a href="ao_plugin_driver_info.html">ao_plugin_driver_info()</a><br>
+<a href="ao_plugin_device_init.html">ao_plugin_device_init()</a><br>
+<a href="ao_plugin_set_option.html">ao_plugin_set_option()</a><br>
+<a href="ao_plugin_open.html">ao_plugin_open()</a><br>
+<a href="ao_plugin_play.html">ao_plugin_play()</a><br>
+<a href="ao_plugin_close.html">ao_plugin_close()</a><br>
+<a href="ao_plugin_device_clear.html">ao_plugin_device_clear()</a><br>
<br><br>
<hr noshade>
No revision
No revision
1.1.2.1 +61 -0 ao/doc/Attic/ao_plugin_close.html
1.1.2.1 +53 -0 ao/doc/Attic/ao_plugin_device_clear.html
1.1.2.1 +67 -0 ao/doc/Attic/ao_plugin_device_init.html
1.1.2.1 +54 -0 ao/doc/Attic/ao_plugin_driver_info.html
1.1.2.1 +71 -0 ao/doc/Attic/ao_plugin_open.html
1.1.2.1 +70 -0 ao/doc/Attic/ao_plugin_play.html
1.1.2.1 +73 -0 ao/doc/Attic/ao_plugin_set_option.html
1.1.2.1 +59 -0 ao/doc/Attic/ao_plugin_test.html
No revision
No revision
1.1.2.2 +9 -9 ao/include/ao/Attic/plugin.h
Index: plugin.h
===================================================================
RCS file: /usr/local/cvsroot/ao/include/ao/Attic/plugin.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- plugin.h 2001/07/22 03:35:47 1.1.2.1
+++ plugin.h 2001/07/24 00:08:02 1.1.2.2
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
#ifndef __PLUGIN_H__
@@ -33,15 +33,15 @@
#include <stdlib.h>
#include "os_types.h"
-int plugin_test();
-ao_info *plugin_driver_info();
-int plugin_device_init(ao_device *device);
-int plugin_set_option(ao_device *device, const char *key, const char *value);
-int plugin_open(ao_device *device, ao_sample_format *format);
-int plugin_play(ao_device *device, const char *output_samples,
+int ao_plugin_test();
+ao_info *ao_plugin_driver_info();
+int ao_plugin_device_init(ao_device *device);
+int ao_plugin_set_option(ao_device *device, const char *key, const char *value);
+int ao_plugin_open(ao_device *device, ao_sample_format *format);
+int ao_plugin_play(ao_device *device, const char *output_samples,
uint_32 num_bytes);
-int plugin_close(ao_device *device);
-void plugin_device_clear(ao_device *device);
+int ao_plugin_close(ao_device *device);
+void ao_plugin_device_clear(ao_device *device);
#ifdef __cplusplus
}
No revision
No revision
1.15.2.3 +8 -8 ao/src/audio_out.c
Index: audio_out.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/audio_out.c,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -r1.15.2.2 -r1.15.2.3
--- audio_out.c 2001/07/23 23:13:29 1.15.2.2
+++ audio_out.c 2001/07/24 00:08:02 1.15.2.3
@@ -109,32 +109,32 @@
return NULL;
}
- dt->functions->test = dlsym(dt->handle, "plugin_test");
+ dt->functions->test = dlsym(dt->handle, "ao_plugin_test");
if (dlerror()) { free(dt->functions); free(dt); return NULL; }
dt->functions->driver_info =
- dlsym(dt->handle, "plugin_driver_info");
+ dlsym(dt->handle, "ao_plugin_driver_info");
if (dlerror()) { free(dt->functions); free(dt); return NULL; }
dt->functions->device_init =
- dlsym(dt->handle, "plugin_device_init");
+ dlsym(dt->handle, "ao_plugin_device_init");
if (dlerror()) { free(dt->functions); free(dt); return NULL; }
dt->functions->set_option =
- dlsym(dt->handle, "plugin_set_option");
+ dlsym(dt->handle, "ao_plugin_set_option");
if (dlerror()) { free(dt->functions); free(dt); return NULL; }
- dt->functions->open = dlsym(dt->handle, "plugin_open");
+ dt->functions->open = dlsym(dt->handle, "ao_plugin_open");
if (dlerror()) { free(dt->functions); free(dt); return NULL; }
- dt->functions->play = dlsym(dt->handle, "plugin_play");
+ dt->functions->play = dlsym(dt->handle, "ao_plugin_play");
if (dlerror()) { free(dt->functions); free(dt); return NULL; }
- dt->functions->close = dlsym(dt->handle, "plugin_close");
+ dt->functions->close = dlsym(dt->handle, "ao_plugin_close");
if (dlerror()) { free(dt->functions); free(dt); return NULL; }
dt->functions->device_clear =
- dlsym(dt->handle, "plugin_device_clear");
+ dlsym(dt->handle, "ao_plugin_device_clear");
if (dlerror()) { free(dt->functions); free(dt); return NULL; }
No revision
No revision
1.5.2.3 +8 -18 ao/src/plugins/alsa/ao_alsa.c
Index: ao_alsa.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/alsa/ao_alsa.c,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- ao_alsa.c 2001/07/23 13:23:15 1.5.2.2
+++ ao_alsa.c 2001/07/24 00:08:03 1.5.2.3
@@ -62,18 +62,8 @@
} ao_alsa_internal;
-static int _is_big_endian(void)
+int ao_plugin_test()
{
- uint_16 pattern = 0xbabe;
- unsigned char *bytewise = (unsigned char *)&pattern;
-
- if (bytewise[0] == 0xba) return 1;
- return 0;
-}
-
-
-int plugin_test()
-{
snd_pcm_t *handle;
if (snd_pcm_open(&handle, 0, 0,
@@ -86,13 +76,13 @@
}
-ao_info *plugin_driver_info(void)
+ao_info *ao_plugin_driver_info(void)
{
return &ao_alsa_info;
}
-int plugin_device_init(ao_device *device)
+int ao_plugin_device_init(ao_device *device)
{
ao_alsa_internal *internal;
@@ -111,7 +101,7 @@
}
-int plugin_set_option(ao_device *device, const char *key, const char *value)
+int ao_plugin_set_option(ao_device *device, const char *key, const char *value)
{
ao_alsa_internal *internal = (ao_alsa_internal *) device->internal;
if (!strcmp(key, "card"))
@@ -124,7 +114,7 @@
return 1;
}
-int plugin_open(ao_device *device, ao_sample_format *format)
+int ao_plugin_open(ao_device *device, ao_sample_format *format)
{
ao_alsa_internal *internal = (ao_alsa_internal *) device->internal;
@@ -229,7 +219,7 @@
}
-int plugin_play(ao_device *device, const char *output_samples,
+int ao_plugin_play(ao_device *device, const char *output_samples,
uint_32 num_bytes)
{
ao_alsa_internal *internal = (ao_alsa_internal *) device->internal;
@@ -259,7 +249,7 @@
}
-int plugin_close(ao_device *device)
+int ao_plugin_close(ao_device *device)
{
ao_alsa_internal *internal = (ao_alsa_internal *) device->internal;
int result;
@@ -273,7 +263,7 @@
}
-void plugin_device_clear(ao_device *device)
+void ao_plugin_device_clear(ao_device *device)
{
ao_alsa_internal *internal = (ao_alsa_internal *) device->internal;
No revision
No revision
1.2.2.2 +1 -2 ao/src/plugins/arts/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/arts/Makefile.am,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- Makefile.am 2001/07/22 03:35:51 1.2.2.1
+++ Makefile.am 2001/07/24 00:08:04 1.2.2.2
@@ -16,13 +16,12 @@
endif
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include @ARTS_CFLAGS@
libdir = $(plugindir)
lib_LTLIBRARIES = $(artsltlibs)
libarts_la_LDFLAGS = $(artsldflags)
-CFLAGS = @ARTS_CFLAGS@
libarts_la_LIBADD = @ARTS_LIBS@
libarts_la_SOURCES = $(artssources)
1.3.2.3 +8 -8 ao/src/plugins/arts/ao_arts.c
Index: ao_arts.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/arts/ao_arts.c,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- ao_arts.c 2001/07/22 20:52:48 1.3.2.2
+++ ao_arts.c 2001/07/24 00:08:04 1.3.2.3
@@ -50,7 +50,7 @@
} ao_arts_internal;
-int plugin_test()
+int ao_plugin_test()
{
if (arts_init() == 0) {
arts_free();
@@ -60,13 +60,13 @@
}
-ao_info *plugin_driver_info(void)
+ao_info *ao_plugin_driver_info(void)
{
return &ao_arts_info;
}
-int plugin_device_init(ao_device *device)
+int ao_plugin_device_init(ao_device *device)
{
ao_arts_internal *internal;
@@ -81,12 +81,12 @@
}
-int plugin_set_option(ao_device *device, const char *key, const char *value)
+int ao_plugin_set_option(ao_device *device, const char *key, const char *value)
{
return 1; /* No options */
}
-int plugin_open(ao_device *device, ao_sample_format *format)
+int ao_plugin_open(ao_device *device, ao_sample_format *format)
{
ao_arts_internal *internal = (ao_arts_internal *) device->internal;
int errorcode;
@@ -108,7 +108,7 @@
}
-int plugin_play(ao_device *device, const char *output_samples,
+int ao_plugin_play(ao_device *device, const char *output_samples,
uint_32 num_bytes)
{
ao_arts_internal *internal = (ao_arts_internal *) device->internal;
@@ -121,7 +121,7 @@
}
-int plugin_close(ao_device *device)
+int ao_plugin_close(ao_device *device)
{
ao_arts_internal *internal = (ao_arts_internal *) device->internal;
arts_close_stream(internal->stream);
@@ -131,7 +131,7 @@
}
-void plugin_device_clear(ao_device *device)
+void ao_plugin_device_clear(ao_device *device)
{
ao_arts_internal *internal = (ao_arts_internal *) device->internal;
No revision
No revision
1.4.2.2 +8 -8 ao/src/plugins/esd/ao_esd.c
Index: ao_esd.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/esd/ao_esd.c,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- ao_esd.c 2001/07/22 03:35:51 1.4.2.1
+++ ao_esd.c 2001/07/24 00:08:04 1.4.2.2
@@ -55,7 +55,7 @@
} ao_esd_internal;
-int plugin_test()
+int ao_plugin_test()
{
int sock;
@@ -69,13 +69,13 @@
}
-ao_info *plugin_driver_info(void)
+ao_info *ao_plugin_driver_info(void)
{
return &ao_esd_info;
}
-int plugin_device_init(ao_device *device)
+int ao_plugin_device_init(ao_device *device)
{
ao_esd_internal *internal;
@@ -91,7 +91,7 @@
return 1; /* Memory alloc successful */
}
-int plugin_set_option(ao_device *device, const char *key, const char *value)
+int ao_plugin_set_option(ao_device *device, const char *key, const char *value)
{
ao_esd_internal *internal = (ao_esd_internal *) device->internal;
@@ -103,7 +103,7 @@
return 1;
}
-int plugin_open(ao_device *device, ao_sample_format *format)
+int ao_plugin_open(ao_device *device, ao_sample_format *format)
{
ao_esd_internal *internal = (ao_esd_internal *) device->internal;
int esd_bits;
@@ -143,7 +143,7 @@
return 1;
}
-int plugin_play(ao_device *device, const char* output_samples,
+int ao_plugin_play(ao_device *device, const char* output_samples,
uint_32 num_bytes)
{
ao_esd_internal *internal = (ao_esd_internal *) device->internal;
@@ -155,7 +155,7 @@
}
-int plugin_close(ao_device *device)
+int ao_plugin_close(ao_device *device)
{
ao_esd_internal *internal = (ao_esd_internal *) device->internal;
@@ -165,7 +165,7 @@
}
-void plugin_device_clear(ao_device *device)
+void ao_plugin_device_clear(ao_device *device)
{
ao_esd_internal *internal = (ao_esd_internal *) device->internal;
No revision
No revision
1.3.2.2 +8 -8 ao/src/plugins/irix/ao_irix.c
Index: ao_irix.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/irix/ao_irix.c,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- ao_irix.c 2001/07/22 03:35:52 1.3.2.1
+++ ao_irix.c 2001/07/24 00:08:05 1.3.2.2
@@ -58,7 +58,7 @@
};
-int plugin_test()
+int ao_plugin_test()
{
char *dev_path;
ALport port;
@@ -73,13 +73,13 @@
}
-ao_info *plugin_driver_info(void)
+ao_info *ao_plugin_driver_info(void)
{
return &ao_irix_info;
}
-int plugin_device_init(ao_device *device)
+int ao_plugin_device_init(ao_device *device)
{
ao_irix_internal *internal;
@@ -96,7 +96,7 @@
}
-int plugin_set_option(ao_device *device, const char *key, const char *value)
+int ao_plugin_set_option(ao_device *device, const char *key, const char *value)
{
return 1; /* No options */
}
@@ -105,7 +105,7 @@
/*
* open the audio device for writing to
*/
-int plugin_open(ao_device *device, ao_sample_format *format)
+int ao_plugin_open(ao_device *device, ao_sample_format *format)
{
ao_irix_internal *internal = (ao_irix_internal *) device->internal;
ALpv params[2];
@@ -194,7 +194,7 @@
/*
* play the sample to the already opened file descriptor
*/
-int plugin_play(ao_device *device, const char *output_samples,
+int ao_plugin_play(ao_device *device, const char *output_samples,
uint_32 num_bytes)
{
ao_irix_internal *internal = (ao_irix_internal *) device->internal;
@@ -204,7 +204,7 @@
return 1; /* FIXME: Need to check if the above function failed */
}
-int plugin_close(ao_device *device)
+int ao_plugin_close(ao_device *device)
{
ao_irix_internal *internal = (ao_irix_internal *) device->internal;
@@ -214,7 +214,7 @@
}
-void plugin_device_clear(ao_device *device)
+void ao_plugin_device_clear(ao_device *device)
{
ao_irix_internal *internal = (ao_irix_internal *) device->internal;
No revision
No revision
1.6.2.2 +8 -8 ao/src/plugins/oss/ao_oss.c
Index: ao_oss.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/oss/ao_oss.c,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- ao_oss.c 2001/07/22 03:35:53 1.6.2.1
+++ ao_oss.c 2001/07/24 00:08:05 1.6.2.2
@@ -105,7 +105,7 @@
}
-int plugin_test()
+int ao_plugin_test()
{
char *dev_path;
int fd;
@@ -119,13 +119,13 @@
}
-ao_info *plugin_driver_info(void)
+ao_info *ao_plugin_driver_info(void)
{
return &ao_oss_info;
}
-int plugin_device_init(ao_device *device)
+int ao_plugin_device_init(ao_device *device)
{
ao_oss_internal *internal;
@@ -141,7 +141,7 @@
return 1; /* Memory alloc successful */
}
-int plugin_set_option(ao_device *device, const char *key, const char *value)
+int ao_plugin_set_option(ao_device *device, const char *key, const char *value)
{
ao_oss_internal *internal = (ao_oss_internal *) device->internal;
@@ -159,7 +159,7 @@
/*
* open the audio device for writing to
*/
-int plugin_open(ao_device *device, ao_sample_format *format)
+int ao_plugin_open(ao_device *device, ao_sample_format *format)
{
ao_oss_internal *internal = (ao_oss_internal *) device->internal;
int tmp;
@@ -225,7 +225,7 @@
/*
* play the sample to the already opened file descriptor
*/
-int plugin_play(ao_device *device, const char *output_samples,
+int ao_plugin_play(ao_device *device, const char *output_samples,
uint_32 num_bytes)
{
ao_oss_internal *internal = (ao_oss_internal *) device->internal;
@@ -237,7 +237,7 @@
}
-int plugin_close(ao_device *device)
+int ao_plugin_close(ao_device *device)
{
ao_oss_internal *internal = (ao_oss_internal *) device->internal;
close(internal->fd);
@@ -246,7 +246,7 @@
}
-void plugin_device_clear(ao_device *device)
+void ao_plugin_device_clear(ao_device *device)
{
ao_oss_internal *internal = (ao_oss_internal *) device->internal;
No revision
No revision
1.1.2.3 +8 -8 ao/src/plugins/sun/ao_sun.c
Index: ao_sun.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/sun/ao_sun.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ao_sun.c 2001/07/22 13:16:14 1.1.2.2
+++ ao_sun.c 2001/07/24 00:08:06 1.1.2.3
@@ -64,7 +64,7 @@
} ao_sun_internal;
-int plugin_test()
+int ao_plugin_test()
{
int fd;
@@ -77,13 +77,13 @@
}
-ao_info *plugin_driver_info(void)
+ao_info *ao_plugin_driver_info(void)
{
return &ao_sun_info;
}
-int plugin_device_init(ao_device *device)
+int ao_plugin_device_init(ao_device *device)
{
ao_sun_internal *internal;
@@ -104,7 +104,7 @@
return 1; /* Memory alloc successful */
}
-int plugin_set_option(ao_device *device, const char *key, const char *value)
+int ao_plugin_set_option(ao_device *device, const char *key, const char *value)
{
ao_sun_internal *internal = (ao_sun_internal *) device->internal;
@@ -119,7 +119,7 @@
}
-int plugin_open(ao_device *device, ao_sample_format *format)
+int ao_plugin_open(ao_device *device, ao_sample_format *format)
{
ao_sun_internal *internal = (ao_sun_internal *) device->internal;
@@ -148,7 +148,7 @@
}
-int plugin_play(ao_device *device, const char *output_samples,
+int ao_plugin_play(ao_device *device, const char *output_samples,
uint_32 num_bytes)
{
ao_sun_internal *internal = (ao_sun_internal *) device->internal;
@@ -160,7 +160,7 @@
}
-int plugin_close(ao_device *device)
+int ao_plugin_close(ao_device *device)
{
ao_sun_internal *internal = (ao_sun_internal *) device->internal;
@@ -170,7 +170,7 @@
}
-void plugin_device_clear(ao_device *device)
+void ao_plugin_device_clear(ao_device *device)
{
ao_sun_internal *internal = (ao_sun_internal *) device->internal;
--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list