[girl] Prepare 9.5.0.
- From: Ole Aamot <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [girl] Prepare 9.5.0.
- Date: Sun, 14 Aug 2016 19:18:57 +0000 (UTC)
commit 45c7f1e42f42bfe4b428dbfade3cd6273fcb7eec
Author: Ole Aamot <oka oka no>
Date: Fri Aug 5 15:30:05 2016 +0200
Prepare 9.5.0.
NEWS | 10 ++++++++++
configure | 31 ++++++++++++++++++++-----------
configure.ac | 5 +++--
src/girl-gui.c | 13 +++++++------
src/girl-station.c | 4 ++++
src/girl.c | 22 +++++++++++++++++++++-
src/girl.h | 5 +++++
7 files changed, 70 insertions(+), 20 deletions(-)
---
diff --git a/NEWS b/NEWS
index 3d1bacf..a433a52 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,14 @@
=============
+Version 9.5.0
+=============
+
+GUI
+ * src/girl.c: Add translation credits for Laudivan Freire de Almeida
+ * src/girl.[ch]: Add History callback
+ * src/girl-gui.c: Add History button
+ * src/girl-station.c: Add and increment station_count variable
+
+=============
Version 9.4.0
=============
diff --git a/configure b/configure
index c82f815..6c0379f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for girl 9.4.0.
+# Generated by GNU Autoconf 2.69 for girl 9.5.0.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='girl'
PACKAGE_TARNAME='girl'
-PACKAGE_VERSION='9.4.0'
-PACKAGE_STRING='girl 9.4.0'
+PACKAGE_VERSION='9.5.0'
+PACKAGE_STRING='girl 9.5.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures girl 9.4.0 to adapt to many kinds of systems.
+\`configure' configures girl 9.5.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1430,7 +1430,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of girl 9.4.0:";;
+ short | recursive ) echo "Configuration of girl 9.5.0:";;
esac
cat <<\_ACEOF
@@ -1545,7 +1545,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-girl configure 9.4.0
+girl configure 9.5.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1910,7 +1910,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by girl $as_me 9.4.0, which was
+It was created by girl $as_me 9.5.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2773,7 +2773,7 @@ fi
# Define the identity of the package.
PACKAGE='girl'
- VERSION='9.4.0'
+ VERSION='9.5.0'
cat >>confdefs.h <<_ACEOF
@@ -4333,12 +4333,14 @@ if test -n "$GIRL_CFLAGS"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.0 \\
glib-2.0 >= 2.40 \\
+ gstreamer-1.0 >= 1.0 \\
libgnome-2.0 >= 2.0 \\
libgnomeui-2.0 >= 2.0 \\
libxml-2.0 >= 2.0 \\
gnome-vfs-2.0 >= 2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.40 \
+ gstreamer-1.0 >= 1.0 \
libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
@@ -4348,6 +4350,7 @@ if test -n "$GIRL_CFLAGS"; then
test $ac_status = 0; }; then
pkg_cv_GIRL_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.40 \
+ gstreamer-1.0 >= 1.0 \
libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
@@ -4365,12 +4368,14 @@ if test -n "$GIRL_LIBS"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.0 \\
glib-2.0 >= 2.40 \\
+ gstreamer-1.0 >= 1.0 \\
libgnome-2.0 >= 2.0 \\
libgnomeui-2.0 >= 2.0 \\
libxml-2.0 >= 2.0 \\
gnome-vfs-2.0 >= 2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.40 \
+ gstreamer-1.0 >= 1.0 \
libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
@@ -4380,6 +4385,7 @@ if test -n "$GIRL_LIBS"; then
test $ac_status = 0; }; then
pkg_cv_GIRL_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.40 \
+ gstreamer-1.0 >= 1.0 \
libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
@@ -4406,6 +4412,7 @@ fi
if test $_pkg_short_errors_supported = yes; then
GIRL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.40 \
+ gstreamer-1.0 >= 1.0 \
libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
@@ -4413,6 +4420,7 @@ fi
else
GIRL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.40 \
+ gstreamer-1.0 >= 1.0 \
libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
@@ -4423,6 +4431,7 @@ fi
as_fn_error $? "Package requirements (gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.40 \
+ gstreamer-1.0 >= 1.0 \
libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
@@ -4459,7 +4468,7 @@ $as_echo "yes" >&6; }
fi
-GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0"
+GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, gstreamer-1.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0"
@@ -7457,7 +7466,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by girl $as_me 9.4.0, which was
+This file was extended by girl $as_me 9.5.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7523,7 +7532,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-girl config.status 9.4.0
+girl config.status 9.5.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 77b34d7..96697f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(girl, 9.4.0)
+AC_INIT(girl, 9.5.0)
AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
AC_CONFIG_SRCDIR([src/girl.c])
AC_CONFIG_HEADER([config.h])
@@ -51,12 +51,13 @@ AC_CHECK_LIB(m, pow, [], [], [])
PKG_CHECK_MODULES(GIRL,
gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.40 \
+ gstreamer-1.0 >= 1.0 \
libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
gnome-vfs-2.0 >= 2.0)
-GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0"
+GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, gstreamer-1.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0"
GTK_DOC_CHECK([1.16], [--flavour no-tmpl])
diff --git a/src/girl-gui.c b/src/girl-gui.c
index 7d688bf..73bc1e6 100644
--- a/src/girl-gui.c
+++ b/src/girl-gui.c
@@ -59,6 +59,10 @@ GnomeUIInfo toolbar[] = {
on_search_button_clicked,
GTK_STOCK_FIND),
GNOMEUIINFO_SEPARATOR,
+ GNOMEUIINFO_ITEM_STOCK(N_("History"), N_("History of radio stations"),
+ on_history_button_clicked,
+ GTK_STOCK_HARDDISK),
+ GNOMEUIINFO_SEPARATOR,
GNOMEUIINFO_ITEM_STOCK(N_("Listen"), N_("Listen to selected radio station"),
on_listen_button_clicked,
GTK_STOCK_MEDIA_PLAY),
@@ -1153,16 +1157,13 @@ GtkWidget *create_girl_app()
girl_data->progress = GTK_PROGRESS_BAR(progress);
#if HAVE_GIRL_RECORD == 1
- gnome_appbar_push(girl_data->appbar,
- _("Search by location from \"Search\" or select a radio station from \"Stations\".
Click \"Listen\" to listen to, or \"Record\" to record from the station."));
+ gnome_appbar_push(girl_data->appbar,_("Search by location from \"Search\" or select a radio station
from \"Stations\". Click \"Listen\" to listen to, or \"Record\" to record from the station."));
#else
- gnome_appbar_push(girl_data->appbar,
- _("Select a radio station from \"Stations\" and click \"Listen\" to listen to the
station."));
-#endif
+ gnome_appbar_push(girl_data->appbar,_("Select a radio station from \"Stations\" and click \"Listen\"
to listen to the station."));
+#endif
/* g_signal_connect(G_OBJECT(calendar), */
/* "day_selected_double_click", */
/* G_CALLBACK (on_listen_button_clicked), girl_data); */
-
g_signal_connect(G_OBJECT(girl_app), "destroy",
G_CALLBACK(quit_app), girl_data);
diff --git a/src/girl-station.c b/src/girl-station.c
index d0149a4..dacad26 100644
--- a/src/girl-station.c
+++ b/src/girl-station.c
@@ -581,6 +581,9 @@ girl_station_parser(GirlStationInfo * station, xmlDocPtr doc,
if ((!xmlStrcmp(sub->name, (const xmlChar *) "stream"))) {
GirlStreamInfo *stream = g_new0(GirlStreamInfo, 1);
+
+ girl->stream_count++;
+
station->stream = stream;
station->stream->mimetype = (gchar *)
@@ -631,6 +634,7 @@ girl_station_parser(GirlStationInfo * station, xmlDocPtr doc,
sub = sub->next;
}
+ girl->station_count++;
return;
}
diff --git a/src/girl.c b/src/girl.c
index 2657a5e..2dc324e 100644
--- a/src/girl.c
+++ b/src/girl.c
@@ -23,6 +23,7 @@
#include <config.h>
#include <glib/gstdio.h>
+#include <glib/glist.h>
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libgnomevfs/gnome-vfs-application-registry.h>
@@ -44,7 +45,7 @@ GList *girl_listeners;
GList *girl_programs;
GList *girl_stations;
GList *girl_streams;
-
+GList *girl_history;
GtkWidget *girl_app;
GtkWidget *archivers_selector = NULL;
@@ -116,6 +117,14 @@ int main(int argc, char *argv[])
if (girl->icon != NULL)
gtk_window_set_icon(GTK_WINDOW(girl_app), girl->icon);
+#if HAVE_GIRL_RECORD == 1
+ appbar_send_msg(_("%i stations and %i streams found "),
+ girl->station_count, girl->stream_count);
+#else
+ appbar_send_msg(_("%i stations and %i streams found"),
+ girl->station_count, girl->stream_count);
+#endif
+
gtk_main();
return 0;
}
@@ -416,6 +425,8 @@ void on_stations_selector_button_clicked(GtkWidget * a, gpointer user_data)
void on_stations_selector_changed(GtkWidget * a, gpointer user_data)
{
+ GirlStationInfo *station;
+
if (girl->selected_station_uri != NULL)
g_free(girl->selected_station_uri);
@@ -449,6 +460,8 @@ void on_stations_selector_changed(GtkWidget * a, gpointer user_data)
girl->selected_station_uri,
girl->selected_station_band);
+ station->name = g_strdup(g_object_get_data(G_OBJECT(a), "station_name"));
+ /* girl_history = g_list_add(GLIST(girl_history), (GirlStationInfo *)station); */
girl_helper_run(girl->selected_station_uri,
girl->selected_station_name,
GIRL_STREAM_SHOUTCAST,
@@ -636,6 +649,7 @@ void about_app(GtkWidget * a, gpointer user_data)
"Andy Daniel Cruz Campos <god_of_war_2 hotmail com> (Spanish
translation)\n"
"Mирослав Николић <miroslavnikolic rocketmail com> (Serbian
translation)\n"
"Balázs Meskó <meskobalazs gmail com> (Hungarian translation)\n"
+ "Laudivan Freire de Almeida <laudivan riseup net> (Brazilian
Portuguese translation)\n"
));
gchar* artists[] = { "Wiki Graphic Designer",
"Aly Raj",
@@ -808,6 +822,12 @@ void about_streams(GtkWidget * a, gpointer user_data)
}
+void on_history_button_clicked(GtkWidget *a, gpointer user_data)
+{
+ girl_history = g_list_insert(girl_history, (gchar*)girl->selected_station_name,
girl->current_station_number++);
+ appbar_send_msg(_("Added %s to history of radio stations as station #%i"),
girl->selected_station_name, girl->current_station_number);
+}
+
void on_search_button_clicked(GtkWidget *a, gpointer user_data)
{
GtkWidget *search;
diff --git a/src/girl.h b/src/girl.h
index 1e9a394..7054263 100644
--- a/src/girl.h
+++ b/src/girl.h
@@ -76,6 +76,7 @@ gint girl_archive_new(gchar *title, gchar *file, gchar *codec);
/* Fetcher for the channels */
void girl_helper_run(char *url, char *name, GirlStreamType type, GirlHelperType girl);
+void on_history_button_clicked(GtkWidget *a, gpointer user_data);
void on_search_button_clicked(GtkWidget * button, gpointer user_data);
void on_listen_button_clicked(GtkWidget * button, gpointer user_data);
void on_record_button_clicked(GtkWidget * button, gpointer user_data);
@@ -119,6 +120,7 @@ struct _GirlData {
gchar *selected_program_description;
GirlRunnersInfo *selected_runners;
gint timeout_id;
+ gint current_station_number;
GirlStationInfo *previous_station;
GirlStationInfo *selected_station;
gchar *selected_station_uri;
@@ -146,6 +148,8 @@ struct _GirlData {
GSubprocessLauncher *record_launcher;
gint record_status;
GPid record_pid;
+ gint station_count;
+ gint stream_count;
};
typedef struct _GirlData GirlData;
@@ -158,5 +162,6 @@ extern GList *girl_listeners;
extern GList *girl_programs;
extern GList *girl_stations;
extern GList *girl_streams;
+extern GList *girl_history;
#endif /* GIRL_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
