Mercurial > audlegacy

changeset 2055:8feb3d69b5be trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - cleanups from oliver@freebsd.org
author nenolod
date Mon, 04 Dec 2006 15:03:22 -0800
parents a98e05ffcf07
children 6f1346ce2764
files ChangeLog audacious/ui_fileinfo.c audacious/ui_playlist.c audtool/audtool.c
diffstat 4 files changed, 36 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Dec 04 15:02:36 2006 -0800
+++ b/ChangeLog	Mon Dec 04 15:03:22 2006 -0800
@@ -1,3 +1,11 @@
+2006-12-04 23:02:36 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3111]
+  - make documentation build on ubuntu
+  
+  trunk/Makefile |   32 ++++++++++++++++----------------
+  1 file changed, 16 insertions(+), 16 deletions(-)
+
+
 2006-12-04 21:25:25 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3109]
   - add gtkdoc settings
--- a/audacious/ui_fileinfo.c	Mon Dec 04 15:02:36 2006 -0800
+++ b/audacious/ui_fileinfo.c	Mon Dec 04 15:03:22 2006 -0800
@@ -101,6 +101,7 @@
 	GdkPixbuf *pixbuf;
 	int width, height;
 	double aspect;
+	GdkPixbuf *pixbuf2;
 
 	if (xml == NULL || widget == NULL)
 		return;
@@ -125,7 +126,7 @@
 			height = cfg.filepopup_pixelsize;
 			width = (int)(cfg.filepopup_pixelsize / aspect);
 		}
-		GdkPixbuf *pixbuf2 = gdk_pixbuf_scale_simple(GDK_PIXBUF(pixbuf), width, height, GDK_INTERP_BILINEAR);
+		pixbuf2 = gdk_pixbuf_scale_simple(GDK_PIXBUF(pixbuf), width, height, GDK_INTERP_BILINEAR);
 		g_object_unref(G_OBJECT(pixbuf));
 		pixbuf = pixbuf2;
 	}
@@ -154,6 +155,7 @@
 	GdkPixbuf *pixbuf;
 	int width, height;
 	double aspect;
+	GdkPixbuf *pixbuf2;
 
 	if (xml == NULL || widget == NULL)
 		return;
@@ -178,7 +180,7 @@
 			height = cfg.filepopup_pixelsize;
 			width = (int)(cfg.filepopup_pixelsize / aspect);
 		}
-		GdkPixbuf *pixbuf2 = gdk_pixbuf_scale_simple(GDK_PIXBUF(pixbuf), width, height, GDK_INTERP_BILINEAR);
+		pixbuf2 = gdk_pixbuf_scale_simple(GDK_PIXBUF(pixbuf), width, height, GDK_INTERP_BILINEAR);
 		g_object_unref(G_OBJECT(pixbuf));
 		pixbuf = pixbuf2;
 	}
--- a/audacious/ui_playlist.c	Mon Dec 04 15:02:36 2006 -0800
+++ b/audacious/ui_playlist.c	Mon Dec 04 15:03:22 2006 -0800
@@ -300,9 +300,10 @@
 gint
 playlistwin_get_height_unshaded(void)
 {
+    gint height;
     cfg.playlist_height /= PLAYLISTWIN_HEIGHT_SNAP;
     cfg.playlist_height *= PLAYLISTWIN_HEIGHT_SNAP;
-    gint height = cfg.playlist_height;
+    height = cfg.playlist_height;
     return height;
 }
 
--- a/audtool/audtool.c	Mon Dec 04 15:02:36 2006 -0800
+++ b/audtool/audtool.c	Mon Dec 04 15:03:22 2006 -0800
@@ -377,6 +377,8 @@
 
 void playlist_delete(gint session, gint argc, gchar **argv)
 {
+	gint playpos;
+
 	if (argc < 3)
 	{
 		g_print("%s: invalid parameters for playlist-delete.\n", argv[0]);
@@ -384,7 +386,7 @@
 		return;
 	}
 
-	gint playpos = atoi(argv[2]);
+	playpos = atoi(argv[2]);
 
 	if (playpos < 1 || playpos > xmms_remote_get_playlist_length(session))
 	{
@@ -406,6 +408,9 @@
 
 void playlist_song(gint session, gint argc, gchar **argv)
 {
+	gint playpos;
+	gchar *song;
+
 	if (argc < 3)
 	{
 		g_print("%s: invalid parameters for playlist-song-title.\n", argv[0]);
@@ -413,7 +418,7 @@
 		return;
 	}
 
-	gint playpos = atoi(argv[2]);
+	playpos = atoi(argv[2]);
 
 	if (playpos < 1 || playpos > xmms_remote_get_playlist_length(session))
 	{
@@ -421,7 +426,7 @@
 		return;
 	}
 
-	gchar *song = xmms_remote_get_playlist_title(session, playpos - 1);
+	song = xmms_remote_get_playlist_title(session, playpos - 1);
 
 	g_print("%s\n", song);
 }
@@ -429,6 +434,8 @@
 
 void playlist_song_length(gint session, gint argc, gchar **argv)
 {
+	gint playpos, frames, length;
+
 	if (argc < 3)
 	{
 		g_print("%s: invalid parameters for playlist-song-length.\n", argv[0]);
@@ -436,7 +443,7 @@
 		return;
 	}
 
-	gint playpos = atoi(argv[2]);
+	playpos = atoi(argv[2]);
 
 	if (playpos < 1 || playpos > xmms_remote_get_playlist_length(session))
 	{
@@ -444,14 +451,16 @@
 		return;
 	}
 
-	gint frames = xmms_remote_get_playlist_time(session, playpos - 1);
-	gint length = frames / 1000;
+	frames = xmms_remote_get_playlist_time(session, playpos - 1);
+	length = frames / 1000;
 
 	g_print("%d:%.2d\n", length / 60, length % 60);
 }
 
 void playlist_song_length_seconds(gint session, gint argc, gchar **argv)
 {
+	gint playpos, frames, length;
+
 	if (argc < 3)
 	{
 		g_print("%s: invalid parameters for playlist-song-length-seconds.\n", argv[0]);
@@ -459,7 +468,7 @@
 		return;
 	}
 
-	gint playpos = atoi(argv[2]);
+	playpos = atoi(argv[2]);
 
 	if (playpos < 1 || playpos > xmms_remote_get_playlist_length(session))
 	{
@@ -467,14 +476,16 @@
 		return;
 	}
 
-	gint frames = xmms_remote_get_playlist_time(session, playpos - 1);
-	gint length = frames / 1000;
+	frames = xmms_remote_get_playlist_time(session, playpos - 1);
+	length = frames / 1000;
 
 	g_print("%d\n", length);
 }
 
 void playlist_song_length_frames(gint session, gint argc, gchar **argv)
 {
+	gint playpos, frames;
+
 	if (argc < 3)
 	{
 		g_print("%s: invalid parameters for playlist-song-length-frames.\n", argv[0]);
@@ -482,7 +493,7 @@
 		return;
 	}
 
-	gint playpos = atoi(argv[2]);
+	playpos = atoi(argv[2]);
 
 	if (playpos < 1 || playpos > xmms_remote_get_playlist_length(session))
 	{
@@ -490,7 +501,7 @@
 		return;
 	}
 
-	gint frames = xmms_remote_get_playlist_time(session, playpos - 1);
+	frames = xmms_remote_get_playlist_time(session, playpos - 1);
 
 	g_print("%d\n", frames);
 }