Mercurial > audlegacy

changeset 731:9783edaae2b5 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - revert OSS warning squashing as the patch created more problems than it solved
author nenolod
date Mon, 27 Feb 2006 15:02:04 -0800
parents 1b3adae291b3
children d77a1c5b5c13
files Plugins/Output/OSS/audio.c Plugins/Output/OSS/configure.c Plugins/Output/OSS/convert.c
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Output/OSS/audio.c	Mon Feb 27 14:34:47 2006 -0800
+++ b/Plugins/Output/OSS/audio.c	Mon Feb 27 15:02:04 2006 -0800
@@ -37,10 +37,10 @@
 static gint fd = 0;
 static char *buffer;
 static gboolean going, prebuffer, paused, unpause, do_pause, remove_prebuffer;
-static gint buffer_size, prebuffer_size, blk_size;
+static gint device_buffer_used, buffer_size, prebuffer_size, blk_size;
 static gint rd_index = 0, wr_index = 0;
 static gint output_time_offset = 0;
-static guint64 written = 0, output_bytes = 0, device_buffer_used;
+static guint64 written = 0, output_bytes = 0;
 static gint flush;
 static gint fragsize, device_buffer_size;
 static gchar *device_name;
@@ -252,7 +252,7 @@
 static inline ssize_t
 write_all(int fd, const void *buf, size_t count)
 {
-    size_t done = 0;
+    ssize_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 guint nbuffer_size = 0;
+    static gint nbuffer_size = 0;
 
     switch (output.format.oss) {
     case AFMT_S16_BE:
--- a/Plugins/Output/OSS/configure.c	Mon Feb 27 14:34:47 2006 -0800
+++ b/Plugins/Output/OSS/configure.c	Mon Feb 27 15:02:04 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)(long)(index++));
+                                 G_CALLBACK(sigfunc), (gpointer) index++);
                 gtk_widget_show(item);
                 gtk_menu_append(GTK_MENU(menu), item);
             }
--- a/Plugins/Output/OSS/convert.c	Mon Feb 27 14:34:47 2006 -0800
+++ b/Plugins/Output/OSS/convert.c	Mon Feb 27 15:02:04 2006 -0800
@@ -27,7 +27,7 @@
 static void *
 oss_get_convert_buffer(struct buffer *buffer, size_t size)
 {
-    if (size > 0 && size <= (size_t)buffer->size)
+    if (size > 0 && size <= buffer->size)
         return buffer->buffer;
 
     buffer->size = size;