Mercurial > audlegacy-plugins

changeset 2791:f9c6a9cb442e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
streambrowser has now an icon
author Calin Crisan ccrisan@gmail.com
date Wed, 09 Jul 2008 22:52:56 +0300
parents c156102069ae
children f3e242d1855b 4c9db0b2194f
files src/streambrowser/Makefile src/streambrowser/gui/streambrowser_win.c src/streambrowser/images/streambrowser-16x16.png src/streambrowser/images/streambrowser-64x64.png src/streambrowser/images/streambrowser.svg src/streambrowser/shoutcast.h src/streambrowser/streambrowser.c src/streambrowser/streambrowser.h src/streambrowser/streamdir.h
diffstat 9 files changed, 271 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/streambrowser/Makefile	Wed Jul 09 22:07:55 2008 +0300
+++ b/src/streambrowser/Makefile	Wed Jul 09 22:52:56 2008 +0300
@@ -6,7 +6,9 @@
        gui/about_win.c \
        gui/streambrowser_win.c
 
-DATA = images/shoutcast.png
+DATA = images/shoutcast.png \
+       images/streambrowser-16x16.png \
+       images/streambrowser-64x64.png
 
 include ../../buildsys.mk
 include ../../extra.mk
--- a/src/streambrowser/gui/streambrowser_win.c	Wed Jul 09 22:07:55 2008 +0300
+++ b/src/streambrowser/gui/streambrowser_win.c	Wed Jul 09 22:52:56 2008 +0300
@@ -81,6 +81,7 @@
 	gtk_window_set_title(GTK_WINDOW(streambrowser_window), _("Stream browser"));
 	gtk_window_set_position(GTK_WINDOW(streambrowser_window), GTK_WIN_POS_CENTER);
 	gtk_window_set_default_size(GTK_WINDOW(streambrowser_window), 700, 400);
+	gtk_window_set_icon_from_file(GTK_WINDOW(streambrowser_window), STREAMBROWSER_ICON, NULL);
 	g_signal_connect(G_OBJECT(streambrowser_window), "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), streambrowser_window);
 	gtk_container_add(GTK_CONTAINER(streambrowser_window), vbox1);
 
Binary file src/streambrowser/images/streambrowser-16x16.png has changed
Binary file src/streambrowser/images/streambrowser-64x64.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/streambrowser/images/streambrowser.svg	Wed Jul 09 22:52:56 2008 +0300
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="128px"
+   height="128px"
+   id="RSSicon"
+   viewBox="0 0 256 256"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="Feed-icon.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata33">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="967"
+     inkscape:window-width="1225"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="1.9296875"
+     inkscape:cx="153.86031"
+     inkscape:cy="-44.300212"
+     inkscape:window-x="455"
+     inkscape:window-y="57"
+     inkscape:current-layer="RSSicon" />
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient3744">
+      <stop
+         style="stop-color:#3c5aa0;stop-opacity:1;"
+         offset="0"
+         id="stop3746" />
+      <stop
+         id="stop3752"
+         offset="0.2962963"
+         style="stop-color:#5979c1;stop-opacity:1;" />
+      <stop
+         style="stop-color:#243660;stop-opacity:1;"
+         offset="1"
+         id="stop3748" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3210">
+      <stop
+         style="stop-color:#ff7326;stop-opacity:1;"
+         offset="0"
+         id="stop3212" />
+      <stop
+         id="stop3218"
+         offset="1"
+         style="stop-color:#ff7426;stop-opacity:1;" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 64 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="128 : 64 : 1"
+       inkscape:persp3d-origin="64 : 42.666667 : 1"
+       id="perspective35" />
+    <linearGradient
+       x1="0.085000001"
+       y1="0.085000001"
+       x2="0.91500002"
+       y2="0.91500002"
+       id="RSSg"
+       xlink:href="#linearGradient3210">
+      <stop
+         offset="0"
+         stop-color="#DE642B"
+         id="stop16"
+         style="stop-color:#768bc7;stop-opacity:1;" />
+      <stop
+         offset="1"
+         stop-color="#D95B29"
+         id="stop18"
+         style="stop-color:#3c5aa0;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3210"
+       id="linearGradient3216"
+       x1="44"
+       y1="125.5"
+       x2="219"
+       y2="125.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3210"
+       id="linearGradient3226"
+       x1="44"
+       y1="155"
+       x2="160"
+       y2="155"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3210"
+       id="linearGradient3234"
+       x1="44"
+       y1="189"
+       x2="92"
+       y2="189"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3210"
+       id="linearGradient3275"
+       gradientUnits="userSpaceOnUse"
+       x1="44"
+       y1="189"
+       x2="92"
+       y2="189" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3210"
+       id="linearGradient3277"
+       gradientUnits="userSpaceOnUse"
+       x1="44"
+       y1="155"
+       x2="160"
+       y2="155" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3210"
+       id="linearGradient3279"
+       gradientUnits="userSpaceOnUse"
+       x1="44"
+       y1="125.5"
+       x2="219"
+       y2="125.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3744"
+       id="linearGradient3750"
+       x1="23.191692"
+       y1="29.795177"
+       x2="234.27405"
+       y2="226.20482"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter3758">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="4.1217132"
+         id="feGaussianBlur3760" />
+    </filter>
+  </defs>
+  <rect
+     width="256"
+     height="256"
+     rx="55"
+     ry="55"
+     x="0"
+     y="0"
+     id="rect20"
+     style="fill:#2f477d;fill-opacity:1"
+     fill="#CC5D15" />
+  <rect
+     width="246"
+     height="246"
+     rx="50"
+     ry="50"
+     x="5"
+     y="5"
+     id="rect22"
+     style="fill:#6180c6;fill-opacity:1"
+     fill="#F49C52" />
+  <rect
+     width="236"
+     height="236"
+     rx="47"
+     ry="47"
+     x="10"
+     y="10"
+     id="rect24"
+     style="fill-opacity:1.0;fill:url(#linearGradient3750)"
+     fill="url(#RSSg)" />
+  <g
+     id="g3289"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1;filter:url(#filter3758)"
+     transform="matrix(-0.5614008,-0.5989944,-0.5948616,0.565301,279.23409,118.24669)">
+    <circle
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+       id="circle3291"
+       r="24"
+       cy="189"
+       cx="68"
+       sodipodi:cx="68"
+       sodipodi:cy="189"
+       sodipodi:rx="24"
+       sodipodi:ry="24" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+       id="path3293"
+       d="M 160,213 L 126,213 C 126,167.71265 89.287349,131 44,131 L 44,97 C 108.06503,97 160,148.93497 160,213 z" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+       id="path3295"
+       d="M 184,213 C 184,135.68014 121.31986,73 44,73 L 44,38 C 140.64983,38 219,116.35017 219,213 L 184,213 z" />
+  </g>
+  <g
+     id="g3236"
+     style="stroke:#000000;stroke-opacity:1"
+     transform="matrix(-0.5614008,-0.5989945,-0.5948617,0.565301,277.11073,108.90355)">
+    <circle
+       style="fill:url(#linearGradient3275);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="circle26"
+       r="24"
+       cy="189"
+       cx="68"
+       sodipodi:cx="68"
+       sodipodi:cy="189"
+       sodipodi:rx="24"
+       sodipodi:ry="24" />
+    <path
+       style="fill:url(#linearGradient3277);fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="path28"
+       d="M 160,213 L 126,213 C 126,167.71265 89.287349,131 44,131 L 44,97 C 108.06503,97 160,148.93497 160,213 z" />
+    <path
+       style="opacity:1;fill:url(#linearGradient3279);fill-opacity:1.0;stroke:#000000;stroke-opacity:1"
+       id="path30"
+       d="M 184,213 C 184,135.68014 121.31986,73 44,73 L 44,38 C 140.64983,38 219,116.35017 219,213 L 184,213 z" />
+  </g>
+</svg>
--- a/src/streambrowser/shoutcast.h	Wed Jul 09 22:07:55 2008 +0300
+++ b/src/streambrowser/shoutcast.h	Wed Jul 09 22:52:56 2008 +0300
@@ -5,16 +5,16 @@
 #include "streambrowser.h"
 #include "streamdir.h"
 
-#define SHOUTCAST_NAME			"Shoutcast"
-#define SHOUTCAST_ICON			DATA_DIR G_DIR_SEPARATOR_S "images" G_DIR_SEPARATOR_S "shoutcast.png"
+#define SHOUTCAST_NAME				"Shoutcast"
+#define SHOUTCAST_ICON				DATA_DIR G_DIR_SEPARATOR_S "images" G_DIR_SEPARATOR_S "shoutcast.png"
 #define SHOUTCAST_STREAMDIR_URL		"http://www.shoutcast.com/sbin/newxml.phtml"
 #define SHOUTCAST_CATEGORY_URL		"http://www.shoutcast.com/sbin/newxml.phtml?genre=%s"
 #define SHOUTCAST_STREAMINFO_URL	"http://www.shoutcast.com/sbin/shoutcast-playlist.pls?rn=%s&file=filename.pls"
 #define SHOUTCAST_BUFFER_SIZE		256
 
 
-gboolean			shoutcast_category_fetch(category_t *category);
-streamdir_t*			shoutcast_streamdir_fetch();
+gboolean							shoutcast_category_fetch(category_t *category);
+streamdir_t*						shoutcast_streamdir_fetch();
 
 
 #endif	// SHOUTCAST_H
--- a/src/streambrowser/streambrowser.c	Wed Jul 09 22:07:55 2008 +0300
+++ b/src/streambrowser/streambrowser.c	Wed Jul 09 22:52:56 2008 +0300
@@ -155,13 +155,13 @@
 {
     /* the plugin services menu */
     playlist_menu_item = gtk_image_menu_item_new_with_label(_("Streambrowser"));
-    gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(playlist_menu_item), gtk_image_new_from_stock(GTK_STOCK_CDROM, GTK_ICON_SIZE_MENU));
+    gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(playlist_menu_item), gtk_image_new_from_file(STREAMBROWSER_ICON_SMALL));
     gtk_widget_show(playlist_menu_item);
     g_signal_connect(G_OBJECT(playlist_menu_item), "activate", G_CALLBACK(on_plugin_services_menu_item_click), NULL);
     audacious_menu_plugin_item_add(AUDACIOUS_MENU_PLAYLIST_RCLICK, playlist_menu_item);
 
     main_menu_item = gtk_image_menu_item_new_with_label(_("Streambrowser"));
-    gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(main_menu_item), gtk_image_new_from_stock(GTK_STOCK_CDROM, GTK_ICON_SIZE_MENU));
+    gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(main_menu_item), gtk_image_new_from_file(STREAMBROWSER_ICON_SMALL));
     gtk_widget_show(main_menu_item);
     g_signal_connect(G_OBJECT(main_menu_item), "activate", G_CALLBACK(on_plugin_services_menu_item_click), NULL);
     audacious_menu_plugin_item_add(AUDACIOUS_MENU_MAIN, main_menu_item);
--- a/src/streambrowser/streambrowser.h	Wed Jul 09 22:07:55 2008 +0300
+++ b/src/streambrowser/streambrowser.h	Wed Jul 09 22:52:56 2008 +0300
@@ -7,10 +7,12 @@
 #include <config.h>
 #include <audacious/i18n.h>
 
-#define DEF_STRING_LEN		1024
-#define DEF_BUFFER_SIZE		512
-#define MAX_UPDATE_THREADS	4
-#define PLAYLIST_TEMP_FILE	"file:///tmp/playlist.pls"
+#define DEF_STRING_LEN				1024
+#define DEF_BUFFER_SIZE				512
+#define MAX_UPDATE_THREADS			4
+#define PLAYLIST_TEMP_FILE			"file:///tmp/playlist.pls"
+#define STREAMBROWSER_ICON_SMALL	DATA_DIR G_DIR_SEPARATOR_S "images" G_DIR_SEPARATOR_S "streambrowser-16x16.png"
+#define STREAMBROWSER_ICON			DATA_DIR G_DIR_SEPARATOR_S "images" G_DIR_SEPARATOR_S "streambrowser-64x64.png"
 
 
 typedef struct {
--- a/src/streambrowser/streamdir.h	Wed Jul 09 22:07:55 2008 +0300
+++ b/src/streambrowser/streamdir.h	Wed Jul 09 22:52:56 2008 +0300
@@ -2,7 +2,6 @@
 #ifndef STREAMDIR_H
 #define STREAMDIR_H
 
-
 #include <glib.h>
 
 #include "streambrowser.h"
@@ -31,7 +30,7 @@
 } streamdir_t;
 
 
-streamdir_t*			streamdir_new(gchar *name);
+streamdir_t*		streamdir_new(gchar *name);
 void				streamdir_delete(streamdir_t *streamdir);
 
 category_t*			category_new(gchar *name);
@@ -43,13 +42,13 @@
 gint				category_get_count(streamdir_t *streamdir);
 gint				category_get_index(streamdir_t *streamdir, category_t *category);
 
-streaminfo_t*			streaminfo_new(gchar *name, gchar *playlist_url, gchar *current_track);
+streaminfo_t*		streaminfo_new(gchar *name, gchar *playlist_url, gchar *current_track);
 void				streaminfo_delete(streaminfo_t *streaminfo);
 void				streaminfo_free(streaminfo_t *streaminfo);
 void				streaminfo_add(category_t *category, streaminfo_t *streaminfo);
 void				streaminfo_remove(category_t *category, streaminfo_t *streaminfo);
-streaminfo_t*			streaminfo_get_by_index(category_t *category, gint index);
-streaminfo_t*			streaminfo_get_by_name(category_t *category, gchar *name);
+streaminfo_t*		streaminfo_get_by_index(category_t *category, gint index);
+streaminfo_t*		streaminfo_get_by_name(category_t *category, gchar *name);
 gint				streaminfo_get_count(category_t *category);
 gint				streaminfo_get_index(category_t *category, streaminfo_t *streaminfo);