Mercurial > audlegacy
changeset 733:3c2bb116f4db trunk
[svn] - remerge fixed version of OSS patch. Submitted by Bren <spike -at- spykes.net>
| author | nenolod |
|---|---|
| date | Mon, 27 Feb 2006 15:43:15 -0800 |
| parents | d77a1c5b5c13 |
| children | 9a5075ce88a8 |
| files | Plugins/Output/OSS/audio.c Plugins/Output/OSS/configure.c Plugins/Output/OSS/convert.c |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Plugins/Output/OSS/audio.c Mon Feb 27 15:20:52 2006 -0800 +++ b/Plugins/Output/OSS/audio.c Mon Feb 27 15:43:15 2006 -0800 @@ -252,7 +252,7 @@ static inline ssize_t write_all(int fd, const void *buf, size_t count) { - ssize_t done = 0; + size_t done = 0; do { ssize_t n = write(fd, (gchar *) buf + done, count - done); if (n == -1) { @@ -423,7 +423,7 @@ { guint w = 0; static gpointer nbuffer = NULL; - static gint nbuffer_size = 0; + static guint nbuffer_size = 0; switch (output.format.oss) { case AFMT_S16_BE:
--- a/Plugins/Output/OSS/configure.c Mon Feb 27 15:20:52 2006 -0800 +++ b/Plugins/Output/OSS/configure.c Mon Feb 27 15:43:15 2006 -0800 @@ -153,7 +153,7 @@ else item = gtk_menu_item_new_with_label(buffer); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(sigfunc), (gpointer) index++); + G_CALLBACK(sigfunc), (gpointer)(long)(index++)); gtk_widget_show(item); gtk_menu_append(GTK_MENU(menu), item); }
--- a/Plugins/Output/OSS/convert.c Mon Feb 27 15:20:52 2006 -0800 +++ b/Plugins/Output/OSS/convert.c Mon Feb 27 15:43:15 2006 -0800 @@ -27,7 +27,7 @@ static void * oss_get_convert_buffer(struct buffer *buffer, size_t size) { - if (size > 0 && size <= buffer->size) + if (size > 0 && size <= (size_t)buffer->size) return buffer->buffer; buffer->size = size;