# HG changeset patch
# User Calin Crisan ccrisan@gmail.com
# Date 1215633176 -10800
# Node ID f9c6a9cb442e9a4414489ef761d02af982c036a1
# Parent c156102069aed9abbf5a150554f63047715a4d8b
streambrowser has now an icon
diff -r c156102069ae -r f9c6a9cb442e src/streambrowser/Makefile
--- 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
diff -r c156102069ae -r f9c6a9cb442e src/streambrowser/gui/streambrowser_win.c
--- 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);
diff -r c156102069ae -r f9c6a9cb442e src/streambrowser/images/streambrowser-16x16.png
Binary file src/streambrowser/images/streambrowser-16x16.png has changed
diff -r c156102069ae -r f9c6a9cb442e src/streambrowser/images/streambrowser-64x64.png
Binary file src/streambrowser/images/streambrowser-64x64.png has changed
diff -r c156102069ae -r f9c6a9cb442e src/streambrowser/images/streambrowser.svg
--- /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 @@
+
+
diff -r c156102069ae -r f9c6a9cb442e src/streambrowser/shoutcast.h
--- 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
diff -r c156102069ae -r f9c6a9cb442e src/streambrowser/streambrowser.c
--- 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);
diff -r c156102069ae -r f9c6a9cb442e src/streambrowser/streambrowser.h
--- 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
#include
-#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 {
diff -r c156102069ae -r f9c6a9cb442e src/streambrowser/streamdir.h
--- 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
#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);