[girl] Add station name in player window
- From: Ole Aamot <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [girl] Add station name in player window
- Date: Sat, 24 Sep 2016 19:24:30 +0000 (UTC)
commit 2cdd7c59466f636e40f9640e832cab8883f5d195
Author: Ole Aamot <oka oka no>
Date: Sat Sep 24 21:24:09 2016 +0200
Add station name in player window
src/girl-player-backend.c | 2 +-
src/girl-player-backend.h | 2 +-
src/girl-player-frontend.c | 4 ++--
src/girl-player-frontend.h | 2 +-
src/girl-player.c | 6 +++---
src/girl-player.h | 2 +-
src/girl-station.c | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/girl-player-backend.c b/src/girl-player-backend.c
index 38e23af..774f451 100644
--- a/src/girl-player-backend.c
+++ b/src/girl-player-backend.c
@@ -112,7 +112,7 @@ GstBusSyncReply CreateWindow (GstBus *bus,GstMessage *message,gpointer data)
}
-gboolean girl_player_backend_start (gchar *uri)
+gboolean girl_player_backend_start (gchar *uri, gchar *name)
{
media->uri = uri;
media->pipeline = gst_element_factory_make ("playbin2", "playbin2");
diff --git a/src/girl-player-backend.h b/src/girl-player-backend.h
index d628f21..0b8e082 100644
--- a/src/girl-player-backend.h
+++ b/src/girl-player-backend.h
@@ -61,7 +61,7 @@ typedef struct GirlMedia {
gboolean girl_player_backend_init (int *argc, char **argv[]);
-gboolean girl_player_backend_start (gchar *uri);
+gboolean girl_player_backend_start (gchar *uri, gchar *name);
static gboolean handle_message (GstBus *bus, GstMessage *message , gpointer data);
diff --git a/src/girl-player-frontend.c b/src/girl-player-frontend.c
index 063e8e6..eb9d4de 100644
--- a/src/girl-player-frontend.c
+++ b/src/girl-player-frontend.c
@@ -79,14 +79,14 @@ girl_player_frontend_pause (GtkWidget *widget, gpointer data)
girl_player_backend_pause();
}
-gboolean girl_player_frontend_start ()
+gboolean girl_player_frontend_start (gchar *name)
{
player->table = gtk_table_new (300,60,FALSE);
player->app_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_position (GTK_WINDOW (player->app_window),GTK_WIN_POS_CENTER_ALWAYS);
- gtk_window_set_title (GTK_WINDOW (player->app_window),"GNOME Internet Radio Locator Player");
+ gtk_window_set_title (GTK_WINDOW (player->app_window),name);
gtk_window_set_default_size (GTK_WINDOW (player->app_window),300,60);
gtk_container_set_border_width (GTK_CONTAINER (player->app_window), 10);
diff --git a/src/girl-player-frontend.h b/src/girl-player-frontend.h
index 4439e3d..b569a9c 100644
--- a/src/girl-player-frontend.h
+++ b/src/girl-player-frontend.h
@@ -57,7 +57,7 @@ typedef struct GirlPlayer {
} GirlPlayer;
gboolean girl_player_frontend_init (int argc, char **argv);
-gboolean girl_player_frontend_start ();
+gboolean girl_player_frontend_start (char *name);
static void video_widget_realize_cb (GtkWidget * widget, gpointer data);
static void girl_player_frontend_play (GtkWidget *widget, gpointer data);
static void girl_player_frontend_pause (GtkWidget *widget, gpointer data);
diff --git a/src/girl-player.c b/src/girl-player.c
index 877f586..804958d 100644
--- a/src/girl-player.c
+++ b/src/girl-player.c
@@ -46,7 +46,7 @@
#include "girl-player-globals.h"
int
-girl_player_main(gchar *streamuri)
+girl_player_main(gchar *streamuri, gchar *name)
{
gchar *uri = g_strdup(streamuri);
@@ -62,11 +62,11 @@ girl_player_main(gchar *streamuri)
/* return 0; */
/* } */
- if (!girl_player_frontend_start ()) {
+ if (!girl_player_frontend_start (name)) {
g_message ("Player UI creation failure....");
exit (0);
}
- if (!girl_player_backend_start (uri)) {
+ if (!girl_player_backend_start (uri, name)) {
g_message ("Girl-Player backend creation failure");
exit (0);
}
diff --git a/src/girl-player.h b/src/girl-player.h
index a32b0cb..751a0ef 100644
--- a/src/girl-player.h
+++ b/src/girl-player.h
@@ -24,7 +24,7 @@
#ifndef __GIRL_PLAYER__
#define __GIRL_PLAYER__
-int girl_player_main(gchar *streamuri);
+int girl_player_main(gchar *streamuri, gchar *name);
#endif /* __GIRL_PLAYER__ */
diff --git a/src/girl-station.c b/src/girl-station.c
index 7664a60..b0425ed 100644
--- a/src/girl-station.c
+++ b/src/girl-station.c
@@ -193,7 +193,7 @@ void girl_helper_run(gchar *url, gchar *name, GirlStreamType type, GirlHelperTyp
app = g_strdup(GIRL_HELPER_RECORD);
}
- girl_player_main(url);
+ girl_player_main(url, girl->selected_station_name);
if (g_strcmp0(app,"no")!=0) {
command = g_strconcat(app, " ", url, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]