[girl] GNOME Internet Radio Locator 9.6.0
- From: Ole Aamot <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [girl] GNOME Internet Radio Locator 9.6.0
- Date: Thu, 1 Dec 2016 22:47:29 +0000 (UTC)
commit 7e28c37c7a05a79fbbc53ea8d5d24d490070adc6
Author: Ole Aamot <oka oka no>
Date: Thu Dec 1 23:46:18 2016 +0100
GNOME Internet Radio Locator 9.6.0
Makefile.am | 1 +
NEWS | 38 ++++++
README | 7 +
autogen.sh | 2 +-
configure | 276 ++--------------------------------------
configure.ac | 39 +------
data/icons/16x16/Makefile.in | 2 -
data/icons/22x22/Makefile.in | 2 -
data/icons/24x24/Makefile.in | 2 -
data/icons/256x256/Makefile.in | 2 -
data/icons/32x32/Makefile.in | 2 -
data/icons/48x48/Makefile.in | 2 -
data/icons/Makefile.in | 2 -
data/pixmaps/Makefile.in | 2 -
data/screenshot.png | Bin 256678 -> 161915 bytes
girl.spec.in | 13 +-
help/C/aboutprogram.html | 35 -----
help/C/aboutprogram.page | 2 +-
help/C/aboutstation.html | 38 ------
help/C/aboutstation.page | 2 +-
help/C/exit.page | 4 +-
help/C/index.html | 70 ----------
help/C/index.page | 9 +-
help/C/intro.html | 40 ------
help/C/intro.page | 2 +-
help/C/listen.html | 41 ------
help/C/listen.page | 8 +-
help/C/media/girl-main.png | Bin 162426 -> 161915 bytes
help/C/next.html | 40 ------
help/C/next.page | 2 +-
help/C/prev.html | 41 ------
help/C/prev.page | 2 +-
help/C/record.html | 42 ------
help/C/record.page | 18 ++--
help/C/search.html | 33 -----
help/C/search.page | 2 +-
help/C/stations.page | 2 +-
help/Makefile.am | 4 +-
help/Makefile.in | 6 +-
help/aboutprogram.html | 35 -----
help/aboutstation.html | 38 ------
help/en_US/aboutprogram.page | 2 +-
help/en_US/aboutstation.page | 2 +-
help/en_US/exit.page | 4 +-
help/en_US/index.page | 9 +-
help/en_US/intro.page | 2 +-
help/en_US/listen.page | 8 +-
help/en_US/next.page | 2 +-
help/en_US/prev.page | 2 +-
help/en_US/record.page | 18 ++--
help/en_US/search.page | 2 +-
help/en_US/stations.page | 2 +-
help/exit.html | 42 ------
help/index.html | 70 ----------
help/intro.html | 40 ------
help/listen.html | 47 -------
help/media/girl-main.png | Bin 162426 -> 161915 bytes
help/next.html | 46 -------
help/prev.html | 47 -------
help/record.html | 52 --------
help/search.html | 39 ------
man/girl.1 | 11 +-
src/Makefile.am | 8 +-
src/Makefile.in | 6 +-
src/girl-player-backend.c | 31 ++---
src/girl-player-backend.h | 2 +-
src/girl-player-frontend.c | 10 +-
src/girl-player-frontend.h | 2 +
src/girl-player.c | 3 +
src/girl-record-backend.c | 8 +-
src/girl-record-backend.h | 2 +-
src/girl-record-frontend.c | 5 +-
src/girl-record-frontend.h | 2 +-
src/girl-record.c | 5 +
src/girl-station.c | 18 ++-
src/girl.c | 18 ++-
src/girl.xml | 4 +-
77 files changed, 205 insertions(+), 1274 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 538427e..9c46d12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST = config.rpath m4/ChangeLog \
ChangeLog \
BROADCAST \
DEBIAN \
+ GNOME3 \
HACKING \
LETTER \
MAILINGLIST \
diff --git a/NEWS b/NEWS
index f472964..a5ebaa7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,42 @@
=============
+Version 9.6.0
+=============
+
+Documentation
+
+ * help/C/aboutprogram.page: Update version
+ * help/C/aboutstation.page: Update version
+ * help/C/exit.page: Update version
+ * help/C/index.page: Update version
+ * help/C/intro.page: Update version
+ * help/C/listen.page: Update version
+ * help/C/media/girl-newstation: Add screenshot
+ * help/C/new.page: Update version
+ * help/C/next.page: Update version
+ * help/C/prev.page: Update version
+ * help/C/record.page: Update version
+ * help/C/search.page: Update version
+ * help/C/station.page: Update version
+
+GUI
+
+ * src/girl-player-frontend.[ch]: New gstreamer player frontend based on gstplayer
+ * src/girl-player-backend.[ch]: New gstreamer player frontend based on gstplayer
+ * src/girl-player.[ch]: New gstreamer player frontend based on gstplayer
+
+Packaging
+
+ * girl.spec.in: Remove the dependency on totem and add a dependency on gstreamer
+
+Translations
+
+ * po/cs.po: Updated Czech translation (Marek Černocký)
+ * po/hu.po: Updated Hungarian translation (Balázs Meskó)
+ * po/pl.po: Updated Polish translation (Piotr Drąg)
+ * po/pt_BR.po: Updated Brazilian Portuguese (Rafael Fontenelle)
+ * po/sv.po: Updated Swedish translation (Anders Jonsson)
+
+=============
Version 9.5.2
=============
diff --git a/README b/README
index f3da59e..956d09e 100644
--- a/README
+++ b/README
@@ -1,4 +1,11 @@
================
+GIRL 9.6.0 notes
+================
+
+GIRL 9.6.0 was released on December 1, 2016 with support for 79 free
+Internet radio stations. This release supports gstreamer playback.
+
+================
GIRL 9.5.2 notes
================
diff --git a/autogen.sh b/autogen.sh
index 452c6c8..b579eac 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,7 @@ which gnome-autogen.sh || {
}
REQUIRED_AUTOCONF_VERSION=2.59
-REQUIRED_AUTOMAKE_VERSION=1.15
+REQUIRED_AUTOMAKE_VERSION=1.14
REQUIRED_INTLTOOL_VERSION=0.40.0
REQUIRED_PKG_CONFIG_VERSION=0.16.0
REQUIRED_GTK_DOC_VERSION=1.9
diff --git a/configure b/configure
index 190348c..2397fb8 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.5.3.
+# Generated by GNU Autoconf 2.69 for girl 9.6.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.5.3'
-PACKAGE_STRING='girl 9.5.3'
+PACKAGE_VERSION='9.6.0'
+PACKAGE_STRING='girl 9.6.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -629,6 +629,7 @@ HELP_DIR
YELP_LC_DIST
YELP_LC_MEDIA_LINKS
LN_S
+GIRL_HELPER_PLAYER
GIRL_PKG_DEPS
GETTEXT_PACKAGE
ALL_LINGUAS
@@ -723,11 +724,6 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
-HAVE_GIRL_RECORD
-HAVE_GIRL_RECORD_FALSE
-HAVE_GIRL_RECORD_TRUE
-GIRL_HELPER_RECORD
-GIRL_HELPER_PLAYER
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -797,7 +793,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_silent_rules
-with_recording
enable_dependency_tracking
with_html_dir
enable_gtk_doc
@@ -1364,7 +1359,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.5.3 to adapt to many kinds of systems.
+\`configure' configures girl 9.6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1430,7 +1425,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of girl 9.5.3:";;
+ short | recursive ) echo "Configuration of girl 9.6.0:";;
esac
cat <<\_ACEOF
@@ -1452,7 +1447,6 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-recording Support recording with streamripper
--with-html-dir=PATH path to installed docs
--with-help-dir=DIR path where help files are installed
@@ -1545,7 +1539,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-girl configure 9.5.3
+girl configure 9.6.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1910,7 +1904,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.5.3, which was
+It was created by girl $as_me 9.6.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2773,7 +2767,7 @@ fi
# Define the identity of the package.
PACKAGE='girl'
- VERSION='9.5.3'
+ VERSION='9.6.0'
cat >>confdefs.h <<_ACEOF
@@ -2870,250 +2864,6 @@ fi
ac_config_headers="$ac_config_headers config.h"
-# Checks for programs.
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}totem", so it can be a program name with args.
-set dummy ${ac_tool_prefix}totem; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GIRL_HELPER_PLAYER+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GIRL_HELPER_PLAYER in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GIRL_HELPER_PLAYER="$GIRL_HELPER_PLAYER" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR
/usr/sbin$PATH_SEPARATOR/usr/etc$PATH_SEPARATOR/etc
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GIRL_HELPER_PLAYER="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-GIRL_HELPER_PLAYER=$ac_cv_path_GIRL_HELPER_PLAYER
-if test -n "$GIRL_HELPER_PLAYER"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIRL_HELPER_PLAYER" >&5
-$as_echo "$GIRL_HELPER_PLAYER" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_GIRL_HELPER_PLAYER"; then
- ac_pt_GIRL_HELPER_PLAYER=$GIRL_HELPER_PLAYER
- # Extract the first word of "totem", so it can be a program name with args.
-set dummy totem; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_GIRL_HELPER_PLAYER+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_GIRL_HELPER_PLAYER in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_GIRL_HELPER_PLAYER="$ac_pt_GIRL_HELPER_PLAYER" # Let the user override the test with a
path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR
/usr/sbin$PATH_SEPARATOR/usr/etc$PATH_SEPARATOR/etc
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_GIRL_HELPER_PLAYER="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_GIRL_HELPER_PLAYER=$ac_cv_path_ac_pt_GIRL_HELPER_PLAYER
-if test -n "$ac_pt_GIRL_HELPER_PLAYER"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_GIRL_HELPER_PLAYER" >&5
-$as_echo "$ac_pt_GIRL_HELPER_PLAYER" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_GIRL_HELPER_PLAYER" = x; then
- GIRL_HELPER_PLAYER="/usr/bin/totem"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- GIRL_HELPER_PLAYER=$ac_pt_GIRL_HELPER_PLAYER
- fi
-else
- GIRL_HELPER_PLAYER="$ac_cv_path_GIRL_HELPER_PLAYER"
-fi
-
-
-record_msg="no (http://streamripper.sf.net/)"
-try_record=:
-girl_record=false
-
-
-# Check whether --with-recording was given.
-if test "${with_recording+set}" = set; then :
- withval=$with_recording;
- if test x$withval = xno; then
- try_record=false
- record_msg = "no (not requested)"
- fi
-
-fi
-
-record_prefix=$ac_default_prefix
-if $try_record; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recording" >&5
-$as_echo_n "checking for recording... " >&6; }
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}streamripper", so it can be a program name with args.
-set dummy ${ac_tool_prefix}streamripper; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GIRL_HELPER_RECORD+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GIRL_HELPER_RECORD in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GIRL_HELPER_RECORD="$GIRL_HELPER_RECORD" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR
/usr/sbin$PATH_SEPARATOR/usr/etc$PATH_SEPARATOR/etc
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GIRL_HELPER_RECORD="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-GIRL_HELPER_RECORD=$ac_cv_path_GIRL_HELPER_RECORD
-if test -n "$GIRL_HELPER_RECORD"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIRL_HELPER_RECORD" >&5
-$as_echo "$GIRL_HELPER_RECORD" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_GIRL_HELPER_RECORD"; then
- ac_pt_GIRL_HELPER_RECORD=$GIRL_HELPER_RECORD
- # Extract the first word of "streamripper", so it can be a program name with args.
-set dummy streamripper; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_GIRL_HELPER_RECORD+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_GIRL_HELPER_RECORD in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_GIRL_HELPER_RECORD="$ac_pt_GIRL_HELPER_RECORD" # Let the user override the test with a
path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR
/usr/sbin$PATH_SEPARATOR/usr/etc$PATH_SEPARATOR/etc
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_GIRL_HELPER_RECORD="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_GIRL_HELPER_RECORD=$ac_cv_path_ac_pt_GIRL_HELPER_RECORD
-if test -n "$ac_pt_GIRL_HELPER_RECORD"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_GIRL_HELPER_RECORD" >&5
-$as_echo "$ac_pt_GIRL_HELPER_RECORD" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_GIRL_HELPER_RECORD" = x; then
- GIRL_HELPER_RECORD="no"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- GIRL_HELPER_RECORD=$ac_pt_GIRL_HELPER_RECORD
- fi
-else
- GIRL_HELPER_RECORD="$ac_cv_path_GIRL_HELPER_RECORD"
-fi
-
- if test x${GIRL_HELPER_RECORD} = xno; then
-
-$as_echo "#define HAVE_GIRL_RECORD 0" >>confdefs.h
-
- record_msg="no (http://streamripper.sf.net/)"
- girl_record=false
- else
-
-$as_echo "#define HAVE_GIRL_RECORD 1" >>confdefs.h
-
- record_msg="yes"
- girl_record=true
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $record_msg" >&5
-$as_echo "$record_msg" >&6; }
-fi
- if $girl_record; then
- HAVE_GIRL_RECORD_TRUE=
- HAVE_GIRL_RECORD_FALSE='#'
-else
- HAVE_GIRL_RECORD_TRUE='#'
- HAVE_GIRL_RECORD_FALSE=
-fi
-
-
-
# Checks for libraries.
DEPDIR="${am__leading_dot}deps"
@@ -7038,10 +6788,6 @@ else
am__EXEEXT_FALSE=
fi
-if test -z "${HAVE_GIRL_RECORD_TRUE}" && test -z "${HAVE_GIRL_RECORD_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_GIRL_RECORD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -7475,7 +7221,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.5.3, which was
+This file was extended by girl $as_me 9.6.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7541,7 +7287,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.5.3
+girl config.status 9.6.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 80cc7ed..4cb2ec7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,48 +2,11 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(girl, 9.5.3)
+AC_INIT(girl, 9.6.0)
AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
AC_CONFIG_SRCDIR([src/girl.c])
AC_CONFIG_HEADER([config.h])
-# Checks for programs.
-
-AC_PATH_TOOL([GIRL_HELPER_PLAYER], [totem], [/usr/bin/totem],
- [$PATH$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR]dnl
- [/usr/sbin$PATH_SEPARATOR/usr/etc$PATH_SEPARATOR/etc])
-
-record_msg="no (http://streamripper.sf.net/)"
-try_record=:
-girl_record=false
-
-AC_ARG_WITH([recording],AS_HELP_STRING([--with-recording],[Support recording with streamripper]), [
- if test x$withval = xno; then
- try_record=false
- record_msg = "no (not requested)"
- fi
-])
-record_prefix=$ac_default_prefix
-if $try_record; then
- AC_MSG_CHECKING([for recording])
- AC_PATH_TOOL([GIRL_HELPER_RECORD], [streamripper],
- [no],
- [$PATH$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR]dnl
- [/usr/sbin$PATH_SEPARATOR/usr/etc$PATH_SEPARATOR/etc])
- if test x${GIRL_HELPER_RECORD} = xno; then
- AC_DEFINE([HAVE_GIRL_RECORD],0,[record missing])
- record_msg="no (http://streamripper.sf.net/)"
- girl_record=false
- else
- AC_DEFINE([HAVE_GIRL_RECORD],1,[have record])
- record_msg="yes"
- girl_record=true
- fi
- AC_MSG_RESULT([$record_msg])
-fi
-AM_CONDITIONAL([HAVE_GIRL_RECORD], [$girl_record])
-AC_SUBST([HAVE_GIRL_RECORD])
-
# Checks for libraries.
AC_CHECK_LIB(m, pow, [], [], [])
diff --git a/data/icons/16x16/Makefile.in b/data/icons/16x16/Makefile.in
index 6281401..adaac80 100644
--- a/data/icons/16x16/Makefile.in
+++ b/data/icons/16x16/Makefile.in
@@ -176,7 +176,6 @@ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIRL_CFLAGS = @GIRL_CFLAGS@
GIRL_HELPER_PLAYER = @GIRL_HELPER_PLAYER@
-GIRL_HELPER_RECORD = @GIRL_HELPER_RECORD@
GIRL_LIBS = @GIRL_LIBS@
GIRL_PKG_DEPS = @GIRL_PKG_DEPS@
GMOFILES = @GMOFILES@
@@ -188,7 +187,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
diff --git a/data/icons/22x22/Makefile.in b/data/icons/22x22/Makefile.in
index 9c36d98..7a4b915 100644
--- a/data/icons/22x22/Makefile.in
+++ b/data/icons/22x22/Makefile.in
@@ -176,7 +176,6 @@ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIRL_CFLAGS = @GIRL_CFLAGS@
GIRL_HELPER_PLAYER = @GIRL_HELPER_PLAYER@
-GIRL_HELPER_RECORD = @GIRL_HELPER_RECORD@
GIRL_LIBS = @GIRL_LIBS@
GIRL_PKG_DEPS = @GIRL_PKG_DEPS@
GMOFILES = @GMOFILES@
@@ -188,7 +187,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
diff --git a/data/icons/24x24/Makefile.in b/data/icons/24x24/Makefile.in
index 950cd88..46f770f 100644
--- a/data/icons/24x24/Makefile.in
+++ b/data/icons/24x24/Makefile.in
@@ -176,7 +176,6 @@ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIRL_CFLAGS = @GIRL_CFLAGS@
GIRL_HELPER_PLAYER = @GIRL_HELPER_PLAYER@
-GIRL_HELPER_RECORD = @GIRL_HELPER_RECORD@
GIRL_LIBS = @GIRL_LIBS@
GIRL_PKG_DEPS = @GIRL_PKG_DEPS@
GMOFILES = @GMOFILES@
@@ -188,7 +187,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
diff --git a/data/icons/256x256/Makefile.in b/data/icons/256x256/Makefile.in
index 623b6b2..4e289c2 100644
--- a/data/icons/256x256/Makefile.in
+++ b/data/icons/256x256/Makefile.in
@@ -176,7 +176,6 @@ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIRL_CFLAGS = @GIRL_CFLAGS@
GIRL_HELPER_PLAYER = @GIRL_HELPER_PLAYER@
-GIRL_HELPER_RECORD = @GIRL_HELPER_RECORD@
GIRL_LIBS = @GIRL_LIBS@
GIRL_PKG_DEPS = @GIRL_PKG_DEPS@
GMOFILES = @GMOFILES@
@@ -188,7 +187,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
diff --git a/data/icons/32x32/Makefile.in b/data/icons/32x32/Makefile.in
index 283576c..e2f0bb6 100644
--- a/data/icons/32x32/Makefile.in
+++ b/data/icons/32x32/Makefile.in
@@ -176,7 +176,6 @@ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIRL_CFLAGS = @GIRL_CFLAGS@
GIRL_HELPER_PLAYER = @GIRL_HELPER_PLAYER@
-GIRL_HELPER_RECORD = @GIRL_HELPER_RECORD@
GIRL_LIBS = @GIRL_LIBS@
GIRL_PKG_DEPS = @GIRL_PKG_DEPS@
GMOFILES = @GMOFILES@
@@ -188,7 +187,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
diff --git a/data/icons/48x48/Makefile.in b/data/icons/48x48/Makefile.in
index 3ca91a1..0c59b67 100644
--- a/data/icons/48x48/Makefile.in
+++ b/data/icons/48x48/Makefile.in
@@ -176,7 +176,6 @@ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIRL_CFLAGS = @GIRL_CFLAGS@
GIRL_HELPER_PLAYER = @GIRL_HELPER_PLAYER@
-GIRL_HELPER_RECORD = @GIRL_HELPER_RECORD@
GIRL_LIBS = @GIRL_LIBS@
GIRL_PKG_DEPS = @GIRL_PKG_DEPS@
GMOFILES = @GMOFILES@
@@ -188,7 +187,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 769f92d..b5c101a 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -205,7 +205,6 @@ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIRL_CFLAGS = @GIRL_CFLAGS@
GIRL_HELPER_PLAYER = @GIRL_HELPER_PLAYER@
-GIRL_HELPER_RECORD = @GIRL_HELPER_RECORD@
GIRL_LIBS = @GIRL_LIBS@
GIRL_PKG_DEPS = @GIRL_PKG_DEPS@
GMOFILES = @GMOFILES@
@@ -217,7 +216,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
diff --git a/data/pixmaps/Makefile.in b/data/pixmaps/Makefile.in
index 81a0ff4..633e30f 100644
--- a/data/pixmaps/Makefile.in
+++ b/data/pixmaps/Makefile.in
@@ -175,7 +175,6 @@ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIRL_CFLAGS = @GIRL_CFLAGS@
GIRL_HELPER_PLAYER = @GIRL_HELPER_PLAYER@
-GIRL_HELPER_RECORD = @GIRL_HELPER_RECORD@
GIRL_LIBS = @GIRL_LIBS@
GIRL_PKG_DEPS = @GIRL_PKG_DEPS@
GMOFILES = @GMOFILES@
@@ -187,7 +186,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
diff --git a/data/screenshot.png b/data/screenshot.png
index baceda3..8262bb2 100644
Binary files a/data/screenshot.png and b/data/screenshot.png differ
diff --git a/girl.spec.in b/girl.spec.in
index 1ec2519..ec85779 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -17,18 +17,14 @@ BuildRequires: itstool
BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
BuildRequires: gstreamer-devel
-Requires: totem >= 3.10.1
-Requires: streamripper >= 1.64.6
-Requires: gstreamer >= 0.10.36
+Requires: gstreamer1 >= 1.8.3
%description
GNOME Internet Radio Locator (GIRL) is a program that allows the user
to easily locate and record live radio programs on radio broadcasters
on the Internet.
-GIRL is developed on the GNOME platform and it requires at least
-one audio player such as GNOME Videos to be installed for playback
-and streamripper for recording.
+GIRL is developed on the GNOME platform and it requires gstreamer.
Enjoy Internet Radio.
@@ -73,6 +69,11 @@ fi
%changelog
+* Thu Dec 01 2016 Ole Aamot - 9.6.0-1.fc24
+- Girl 9.6.0 build on Fedora Linux 24
+- Remove dependency on totem
+- Add dependency on gstreamer1
+
* Sat Sep 24 2016 Ole Aamot - 9.5.3-1.fc23
- Girl 9.5.3 build on Fedora Linux 23
diff --git a/help/C/aboutprogram.page b/help/C/aboutprogram.page
index 8ba5e0e..6401fa0 100644
--- a/help/C/aboutprogram.page
+++ b/help/C/aboutprogram.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/C/aboutstation.page b/help/C/aboutstation.page
index 63d5b66..68bea2e 100644
--- a/help/C/aboutstation.page
+++ b/help/C/aboutstation.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/C/exit.page b/help/C/exit.page
index 5dbf69a..65ee5dc 100644
--- a/help/C/exit.page
+++ b/help/C/exit.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
@@ -23,6 +23,6 @@
GNOME Internet Radio Locator
</title>
- <p>However, in order to stop streaming the radio station, you must exit the <app>Videos</app> app.</p>
+ <p>However, in order to stop streaming the radio station, you must click on "Stop" first.</p>
</page>
\ No newline at end of file
diff --git a/help/C/index.page b/help/C/index.page
index df35d1d..f09ef62 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -9,11 +9,11 @@
<title type="link">GNOME Internet Radio Locator</title>
<title type="text">GNOME Internet Radio Locator</title>
- <revision pkgversion="1.8" date="2015-03-08" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
- <years>2015</years>
+ <years>2016</years>
</credit>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"; />
@@ -30,6 +30,11 @@
non-profit, independent Internet radio stations with the <app>GNOME Internet Radio Locator</app>!</p>
<section id="search" style="2column">
+ <title>New</title>
+ <p><link xref="new">New</link> radio station by location.</p>
+ </section>
+
+ <section id="search" style="2column">
<title>Search</title>
<p><link xref="search">Search</link> for radio stations by location.</p>
</section>
diff --git a/help/C/intro.page b/help/C/intro.page
index 5c4f3c9..6b607a0 100644
--- a/help/C/intro.page
+++ b/help/C/intro.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/C/listen.page b/help/C/listen.page
index 0e8ee7e..cad374c 100644
--- a/help/C/listen.page
+++ b/help/C/listen.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
@@ -16,15 +16,13 @@
<title>Listen</title>
- <p>It is possible to listen to supported radio stations in <app>GIRL</app> if you have installed
- the <app>Videos</app> application with the necessary audio codecs.</p>
+ <p>It is possible to listen to supported radio stations in <app>GIRL</app> if you have installed gstreamer
with the necessary audio codecs.</p>
<p>If you have installed Ogg Vorbis audio codec on your computer, then you can listen to many of
the included radio stations.</p>
<p>If you select the radio station from "Stations" and click on "Listen" in the <app>GIRL</app>
- program after you listened to a radio station previously, the default radio station will stream
- in the <app>Videos</app> application.</p>
+ program after you listened to a radio station previously, the default radio station will stream audio with
gstreamer.</p>
<title>
<media type="image" mime="image/png" src="media/girl-listen.png" />
diff --git a/help/C/media/girl-main.png b/help/C/media/girl-main.png
index c48cf75..8262bb2 100644
Binary files a/help/C/media/girl-main.png and b/help/C/media/girl-main.png differ
diff --git a/help/C/next.page b/help/C/next.page
index 783b14d..014c0a2 100644
--- a/help/C/next.page
+++ b/help/C/next.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/C/prev.page b/help/C/prev.page
index 8ce1bf7..8082e27 100644
--- a/help/C/prev.page
+++ b/help/C/prev.page
@@ -2,7 +2,7 @@
<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="prev" xml:lang="en-US">
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/C/record.page b/help/C/record.page
index 29241d6..e3b6a92 100644
--- a/help/C/record.page
+++ b/help/C/record.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
@@ -16,22 +16,22 @@
<title>Record</title>
- <p>It is possible to record from supported radio stations in <app>GIRL</app> if you have installed
- the <app>streamripper</app> application. You can download streamripper from <link
href="http://streamripper.sf.net/";>streamripper.sf.net</link>.</p>
-
- <p>If you have installed streamripper on your computer, then you can record audio broadcasted from
- any of the supported radio stations.</p>
-
+ <p>A planned feature in <app>GIRL</app> is to make it possible to
+ record audio files from supported radio stations in <app>GIRL</app>
+ if you have installed the gstreamer library.</p>
+
<p>If you select the radio station from "Stations" and click on "Listen" in the <app>GIRL</app>
program after you listened to a radio station previously, and then click on "Record", the radio
- station will be recorded and the recorded audio file will be stored in your home directory.</p>
+ station would be recorded and the recorded audio file would be stored in your home directory.</p>
+ <p>Please get in touch and check out src/girl-record.c for the code if you want to implement recording
with gstreamer.</p>
+
<title>
<media type="image" mime="image/png" src="media/girl-record.png" />
Record
</title>
- <p>If you want to stop the streamripper recording process of the radio station, click on "Stop".</p>
+ <p>If you want to stop the recording process of the radio station, click on "Stop".</p>
<title>
<media type="image" mime="image/png" src="media/girl-stop.png" />
diff --git a/help/C/search.page b/help/C/search.page
index e416c1c..5b3fb11 100644
--- a/help/C/search.page
+++ b/help/C/search.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/C/stations.page b/help/C/stations.page
index 310bd08..0697289 100644
--- a/help/C/stations.page
+++ b/help/C/stations.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/Makefile.am b/help/Makefile.am
index e5a3393..6e57b8b 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,6 +1,6 @@
@YELP_HELP_RULES@
HELP_ID = girl
-HELP_FILES = aboutprogram.page aboutstation.page exit.page index.page intro.page legal.xml listen.page
next.page prev.page record.page search.page stations.page
-HELP_MEDIA = media/girl-aboutprogram.png media/girl-aboutstation.png media/girl-exit.png
media/girl-listen.png media/girl-main.png media/girl-next-station.png media/girl-prev-station.png
media/girl-prev-station.png media/girl-record.png media/girl-search-station-by-location.png
media/girl-select-station.png media/girl-stations.png media/girl-stop.png
+HELP_FILES = aboutprogram.page aboutstation.page exit.page index.page intro.page legal.xml listen.page
new.page next.page prev.page record.page search.page stations.page
+HELP_MEDIA = media/girl-aboutprogram.png media/girl-aboutstation.png media/girl-exit.png
media/girl-listen.png media/girl-main.png media/girl-new.png media/girl-newstation.png
media/girl-next-station.png media/girl-prev-station.png media/girl-prev-station.png media/girl-record.png
media/girl-search-station-by-location.png media/girl-select-station.png media/girl-stations.png
media/girl-stop.png
HELP_LINGUAS = cs de es en_US sv
-include $(top_srcdir)/git.mk
diff --git a/help/Makefile.in b/help/Makefile.in
index 58a795b..a820111 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -145,7 +145,6 @@ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIRL_CFLAGS = @GIRL_CFLAGS@
GIRL_HELPER_PLAYER = @GIRL_HELPER_PLAYER@
-GIRL_HELPER_RECORD = @GIRL_HELPER_RECORD@
GIRL_LIBS = @GIRL_LIBS@
GIRL_PKG_DEPS = @GIRL_PKG_DEPS@
GMOFILES = @GMOFILES@
@@ -157,7 +156,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
@@ -257,8 +255,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
HELP_ID = girl
-HELP_FILES = aboutprogram.page aboutstation.page exit.page index.page intro.page legal.xml listen.page
next.page prev.page record.page search.page stations.page
-HELP_MEDIA = media/girl-aboutprogram.png media/girl-aboutstation.png media/girl-exit.png
media/girl-listen.png media/girl-main.png media/girl-next-station.png media/girl-prev-station.png
media/girl-prev-station.png media/girl-record.png media/girl-search-station-by-location.png
media/girl-select-station.png media/girl-stations.png media/girl-stop.png
+HELP_FILES = aboutprogram.page aboutstation.page exit.page index.page intro.page legal.xml listen.page
new.page next.page prev.page record.page search.page stations.page
+HELP_MEDIA = media/girl-aboutprogram.png media/girl-aboutstation.png media/girl-exit.png
media/girl-listen.png media/girl-main.png media/girl-new.png media/girl-newstation.png
media/girl-next-station.png media/girl-prev-station.png media/girl-prev-station.png media/girl-record.png
media/girl-search-station-by-location.png media/girl-select-station.png media/girl-stations.png
media/girl-stop.png
HELP_LINGUAS = cs de es en_US sv
all: all-am
diff --git a/help/en_US/aboutprogram.page b/help/en_US/aboutprogram.page
index 3448ca0..5e8cb04 100644
--- a/help/en_US/aboutprogram.page
+++ b/help/en_US/aboutprogram.page
@@ -3,7 +3,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/en_US/aboutstation.page b/help/en_US/aboutstation.page
index d6f3bf7..bce4a20 100644
--- a/help/en_US/aboutstation.page
+++ b/help/en_US/aboutstation.page
@@ -3,7 +3,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/en_US/exit.page b/help/en_US/exit.page
index c5658a2..d688e6d 100644
--- a/help/en_US/exit.page
+++ b/help/en_US/exit.page
@@ -3,7 +3,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
@@ -22,6 +22,6 @@
GNOME Internet Radio Locator
</title>
- <p>However, in order to stop streaming the radio station, you must exit the <app>Videos</app> app.</p>
+ <p>However, in order to stop streaming the radio station, you must click on "Stop" first.</p>
</page>
diff --git a/help/en_US/index.page b/help/en_US/index.page
index e575c3d..fc0283f 100644
--- a/help/en_US/index.page
+++ b/help/en_US/index.page
@@ -6,11 +6,11 @@
<title type="link">GNOME Internet Radio Locator</title>
<title type="text">GNOME Internet Radio Locator</title>
- <revision pkgversion="1.8" date="2015-03-08" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
- <years>2015</years>
+ <years>2016</years>
</credit>
<include xmlns="http://www.w3.org/2001/XInclude"; href="legal.xml"/>
@@ -27,6 +27,11 @@
non-profit, independent Internet radio stations with the <app>GNOME Internet Radio Locator</app>!</p>
<section id="search" style="2column">
+ <title>New</title>
+ <p><link xref="new">New</link> radio station by location.</p>
+ </section>
+
+ <section id="search" style="2column">
<title>Search</title>
<p><link xref="search">Search</link> for radio stations by location.</p>
</section>
diff --git a/help/en_US/intro.page b/help/en_US/intro.page
index aa127f2..97ecb11 100644
--- a/help/en_US/intro.page
+++ b/help/en_US/intro.page
@@ -3,7 +3,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/en_US/listen.page b/help/en_US/listen.page
index 02d73d1..44818b5 100644
--- a/help/en_US/listen.page
+++ b/help/en_US/listen.page
@@ -3,7 +3,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
@@ -15,15 +15,13 @@
<title>Listen</title>
- <p>It is possible to listen to supported radio stations in <app>GIRL</app> if you have installed
- the <app>Videos</app> application with the necessary audio codecs.</p>
+ <p>It is possible to listen to supported radio stations in <app>GIRL</app> if you have installed gstreamer
with the necessary audio codecs.</p>
<p>If you have installed Ogg Vorbis audio codec on your computer, then you can listen to many of
the included radio stations.</p>
<p>If you select the radio station from "Stations" and click on "Listen" in the <app>GIRL</app>
- program after you listened to a radio station previously, the default radio station will stream
- in the <app>Videos</app> application.</p>
+ program after you listened to a radio station previously, the default radio station will stream audio with
gstreamer.</p>
<title>
<media type="image" mime="image/png" src="media/girl-listen.png"/>
diff --git a/help/en_US/next.page b/help/en_US/next.page
index eb799be..c457782 100644
--- a/help/en_US/next.page
+++ b/help/en_US/next.page
@@ -3,7 +3,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/en_US/prev.page b/help/en_US/prev.page
index 90fdec8..2dc8593 100644
--- a/help/en_US/prev.page
+++ b/help/en_US/prev.page
@@ -2,7 +2,7 @@
<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="prev" xml:lang="en-US">
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name xml:lang="en-US">Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/en_US/record.page b/help/en_US/record.page
index e64e768..4b22c2a 100644
--- a/help/en_US/record.page
+++ b/help/en_US/record.page
@@ -3,7 +3,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
@@ -15,22 +15,22 @@
<title>Record</title>
- <p>It is possible to record from supported radio stations in <app>GIRL</app> if you have installed
- the <app>streamripper</app> application. You can download streamripper from <link
href="http://streamripper.sf.net/";>streamripper.sf.net</link>.</p>
-
- <p>If you have installed streamripper on your computer, then you can record audio broadcasted from
- any of the supported radio stations.</p>
-
+ <p>A planned feature in <app>GIRL</app> is to make it possible to
+ record audio files from supported radio stations in <app>GIRL</app>
+ if you have installed the gstreamer library.</p>
+
<p>If you select the radio station from "Stations" and click on "Listen" in the <app>GIRL</app>
program after you listened to a radio station previously, and then click on "Record", the radio
- station will be recorded and the recorded audio file will be stored in your home directory.</p>
+ station would be recorded and the recorded audio file would be stored in your home directory.</p>
+ <p>Please get in touch and check out src/girl-record.c for the code if you want to implement recording
with gstreamer.</p>
+
<title>
<media type="image" mime="image/png" src="media/girl-record.png"/>
Record
</title>
- <p>If you want to stop the streamripper recording process of the radio station, click on "Stop".</p>
+ <p>If you want to stop the recording process of the radio station, click on "Stop".</p>
<title>
<media type="image" mime="image/png" src="media/girl-stop.png"/>
diff --git a/help/en_US/search.page b/help/en_US/search.page
index f2598bf..dbc6262 100644
--- a/help/en_US/search.page
+++ b/help/en_US/search.page
@@ -3,7 +3,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/en_US/stations.page b/help/en_US/stations.page
index b1f2520..be674c0 100644
--- a/help/en_US/stations.page
+++ b/help/en_US/stations.page
@@ -3,7 +3,7 @@
<info>
<link type="guide" xref="index#main" group="#first"/>
- <revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
+ <revision pkgversion="1.8" date="2016-12-01" status="candidate"/>
<credit type="author copyright">
<name>Ole Aamot</name>
<email>ole src gnome org</email>
diff --git a/help/media/girl-main.png b/help/media/girl-main.png
index c48cf75..8262bb2 100644
Binary files a/help/media/girl-main.png and b/help/media/girl-main.png differ
diff --git a/man/girl.1 b/man/girl.1
index 4152a7c..3060dfa 100644
--- a/man/girl.1
+++ b/man/girl.1
@@ -14,11 +14,8 @@ the GNOME Internet Radio Locator program, allows users to easily listen to and r
The motivation behind this program is to support the user with easy access to independent, free Internet
radio stations around the world. Enjoy Internet Radio.
.SH PLATFORM
.B girl
-is developed for the GNOME desktop and requires one audio helper such
-as Totem (https://developer.gnome.org/totem/) to be installed for
-playback and streamripper (http://streamripper.sourceforge.net/) to be
-installed for recording live radio streams of supported radio
-stations.
+is developed for the GNOME desktop and requires gstreamer to be installed for
+playback and recording live radio streams of supported radio stations.
.SH USAGE
.IP girl
.I "\--help"
@@ -39,5 +36,5 @@ https://git.gnome.org/girl
.B
Ole Aamot <ole src gnome org>
.SH "SEE ALSO"
-.BR totem
-.BR streamripper
+.BR gstreamer
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d168a4..80f862a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
+
AM_CPPFLAGS = $(GIRL_CFLAGS) \
$(NULL)
@@ -22,6 +23,7 @@ test_endianess_LDADD = $(GIRL_LIBS)
test_endianess_CFLAGS = $(GIRL_CFLAGS) -DGIRL_DATADIR="\"$(pkgdatadir)\""
bin_PROGRAMS = girl
+
girl_SOURCES = \
girl-gui.c \
girl-listener.c \
@@ -47,12 +49,14 @@ girl_CFLAGS = $(GIRL_CFLAGS) \
-DGIRL_HELPER_PLAYER=\"$(GIRL_HELPER_PLAYER)\" \
-DGIRL_HELPER_RECORD=\"$(GIRL_HELPER_RECORD)\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
+
girl_LDADD = $(GIRL_LIBS)
girldir = $(datadir)/girl
-girl_DATA = girl-9.5.dtd girl-logo.png girl.png girl.xml
-EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-player.h
girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-record.h girl-record-backend.h
girl-record-globals.h girl-record-frontend.h girl-program.h girl-runners.h girl-streams.h girl-9.5.dtd
girl-map.png girl-logo.png girl.png girl.xml
+girl_DATA = girl-9.6.dtd girl-logo.png girl.png girl.xml
+
+EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-player.h
girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-record.h girl-record-backend.h
girl-record-globals.h girl-record-frontend.h girl-program.h girl-runners.h girl-streams.h girl-9.6.dtd
girl-map.png girl-logo.png girl.png girl.xml
all-local: check-local
diff --git a/src/Makefile.in b/src/Makefile.in
index 4220edc..a703227 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -254,7 +254,6 @@ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIRL_CFLAGS = @GIRL_CFLAGS@
GIRL_HELPER_PLAYER = @GIRL_HELPER_PLAYER@
-GIRL_HELPER_RECORD = @GIRL_HELPER_RECORD@
GIRL_LIBS = @GIRL_LIBS@
GIRL_PKG_DEPS = @GIRL_PKG_DEPS@
GMOFILES = @GMOFILES@
@@ -266,7 +265,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
HELP_DIR = @HELP_DIR@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
@@ -410,8 +408,8 @@ girl_CFLAGS = $(GIRL_CFLAGS) \
girl_LDADD = $(GIRL_LIBS)
girldir = $(datadir)/girl
-girl_DATA = girl-9.5.dtd girl-logo.png girl.png girl.xml
-EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-player.h
girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-record.h girl-record-globals.h
girl-record-frontend.h girl-program.h girl-runners.h girl-streams.h girl-9.5.dtd girl-map.png girl-logo.png
girl.png girl.xml
+girl_DATA = girl-9.6.dtd girl-logo.png girl.png girl.xml
+EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-player.h
girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-record.h girl-record-backend.h
girl-record-globals.h girl-record-frontend.h girl-program.h girl-runners.h girl-streams.h girl-9.6.dtd
girl-map.png girl-logo.png girl.png girl.xml
all: all-am
.SUFFIXES:
diff --git a/src/girl-player-backend.c b/src/girl-player-backend.c
index 0ea93a6..73cac6a 100644
--- a/src/girl-player-backend.c
+++ b/src/girl-player-backend.c
@@ -41,7 +41,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <config.h>
#include "girl.h"
+
#include "girl-player-backend.h"
#include "girl-player-globals.h"
@@ -95,22 +97,19 @@ void girl_player_backend_seek()
GstBusSyncReply CreateWindow (GstBus *bus,GstMessage *message,gpointer data)
{
-
- if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT)
- return GST_BUS_PASS;
- if ( !gst_structure_has_name (message->structure, "prepare-xwindow-id"))
- return GST_BUS_PASS;
-
- if (Window_Xid != 0) {
- GstXOverlay *xoverlay;
- xoverlay = GST_X_OVERLAY (GST_MESSAGE_SRC (message));
- gst_x_overlay_set_xwindow_id (xoverlay, Window_Xid);
- } else {
- g_warning ("Should have obtained Window_Xid by now!");
- }
-
- gst_message_unref (message);
- return GST_BUS_DROP;
+ if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT)
+ return GST_BUS_PASS;
+ if ( !gst_structure_has_name (message->structure, "prepare-xwindow-id"))
+ return GST_BUS_PASS;
+ if (Window_Xid != 0) {
+ GstXOverlay *xoverlay;
+ xoverlay = GST_X_OVERLAY (GST_MESSAGE_SRC (message));
+ gst_x_overlay_set_xwindow_id (xoverlay, Window_Xid);
+ } else {
+ g_warning ("Should have obtained Window_Xid by now!");
+ }
+ gst_message_unref (message);
+ return GST_BUS_DROP;
}
diff --git a/src/girl-player-backend.h b/src/girl-player-backend.h
index 20d880c..0a2db66 100644
--- a/src/girl-player-backend.h
+++ b/src/girl-player-backend.h
@@ -44,11 +44,11 @@
#ifndef __GIRL_PLAYER_BACKEND__
#define __GIRL_PLAYER_BACKEND__
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-
#include <gst/gst.h>
#include <gst/interfaces/xoverlay.h>
diff --git a/src/girl-player-frontend.c b/src/girl-player-frontend.c
index 3ba29b3..cb8a4ea 100644
--- a/src/girl-player-frontend.c
+++ b/src/girl-player-frontend.c
@@ -41,6 +41,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <config.h>
#include "girl.h"
#include "girl-player-backend.h"
#include "girl-player-frontend.h"
@@ -79,11 +80,13 @@ girl_player_frontend_play (GtkWidget *widget, gpointer data)
girl_player_backend_play();
}
-static void
+void
girl_player_frontend_stop (GtkWidget *widget, gpointer data)
{
- girl_player_backend_pause();
- gtk_widget_destroy(girl->player_window);
+ if (girl->player_window != NULL) {
+ girl_player_backend_pause();
+ gtk_widget_destroy(girl->player_window);
+ }
}
static void
@@ -153,4 +156,3 @@ gboolean girl_player_frontend_init (int *argc, gchar **argv[])
else
return FALSE;
}
-
diff --git a/src/girl-player-frontend.h b/src/girl-player-frontend.h
index e8b4050..8538921 100644
--- a/src/girl-player-frontend.h
+++ b/src/girl-player-frontend.h
@@ -59,9 +59,11 @@ typedef struct GirlPlayer {
gboolean girl_player_frontend_init (int *argc, char **argv[]);
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);
static void girl_player_frontend_destroy (GtkWidget *widget, gpointer data);
+void girl_player_frontend_stop (GtkWidget *widget, gpointer data);
#endif
diff --git a/src/girl-player.c b/src/girl-player.c
index da71081..6752afc 100644
--- a/src/girl-player.c
+++ b/src/girl-player.c
@@ -41,7 +41,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <config.h>
+
#include "girl.h"
+
#include "girl-player-frontend.h"
#include "girl-player-backend.h"
#include "girl-player-globals.h"
diff --git a/src/girl-record-backend.c b/src/girl-record-backend.c
index f832ba4..473d9fd 100644
--- a/src/girl-record-backend.c
+++ b/src/girl-record-backend.c
@@ -41,11 +41,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <config.h>
#include "girl.h"
+
#include "girl-record-backend.h"
#include "girl-record-globals.h"
-struct GirlStoreMedia *media;
+GirlStoreMedia *media;
extern GirlData *girl;
static gboolean handler_message (GstBus *bus, GstMessage *message , gpointer data)
@@ -116,7 +118,7 @@ GstBusSyncReply CreateRecordWindow (GstBus *bus,GstMessage *message,gpointer dat
gboolean girl_record_backend_start (gchar *uri, gchar *name)
{
- media = (struct GirlStoreMedia*)malloc(sizeof(GirlStoreMedia));
+ media = (GirlStoreMedia *)malloc(sizeof(GirlStoreMedia));
media->uri = uri;
media->pipeline = gst_element_factory_make ("playbin", "playbin");
if (!media->pipeline)
@@ -138,7 +140,7 @@ gboolean girl_record_backend_start (gchar *uri, gchar *name)
gboolean girl_record_backend_init (int *argc,char **argv[])
{
- media = (struct GirlStoreMedia*)malloc(sizeof(GirlStoreMedia));
+ media = (GirlStoreMedia*)malloc(sizeof(GirlStoreMedia));
if (media != NULL)
return TRUE;
else
diff --git a/src/girl-record-backend.h b/src/girl-record-backend.h
index 9623cfb..406b113 100644
--- a/src/girl-record-backend.h
+++ b/src/girl-record-backend.h
@@ -52,7 +52,7 @@
#include <gst/gst.h>
#include <gst/interfaces/xoverlay.h>
-typedef struct GirlStoreMedia {
+typedef struct _GirlStoreMedia {
GstElement *pipeline;
GstBus *bus;
gchar *uri;
diff --git a/src/girl-record-frontend.c b/src/girl-record-frontend.c
index 72d5a69..008488a 100644
--- a/src/girl-record-frontend.c
+++ b/src/girl-record-frontend.c
@@ -41,6 +41,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <config.h>
#include "girl.h"
#include "girl-record-backend.h"
#include "girl-record-frontend.h"
@@ -49,7 +50,7 @@
extern GtkWidget *girl_app;
extern GirlData *girl;
-struct GirlRecord *record;
+GirlRecord *record;
static void video_widget_realize_cb (GtkWidget * widget, gpointer data)
{
@@ -136,7 +137,7 @@ gboolean girl_record_frontend_start (gchar *name)
}
gboolean girl_record_frontend_init (int *argc, gchar **argv[])
{
- record = (struct GirlStoreMedia*)malloc(sizeof(GirlStoreMedia));
+ record = (GirlRecord *)malloc(sizeof(GirlRecord));
if (record != NULL)
return TRUE;
else
diff --git a/src/girl-record-frontend.h b/src/girl-record-frontend.h
index a65ec4b..b164717 100644
--- a/src/girl-record-frontend.h
+++ b/src/girl-record-frontend.h
@@ -48,7 +48,7 @@
#include <gtk/gtk.h>
#include <glib.h>
-typedef struct GirlRecord {
+typedef struct _GirlRecord {
GtkWidget *app_window;
GtkWidget *video_window;
GtkWidget *pause_button;
diff --git a/src/girl-record.c b/src/girl-record.c
index 49273e4..d40d92f 100644
--- a/src/girl-record.c
+++ b/src/girl-record.c
@@ -41,11 +41,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <config.h>
#include "girl.h"
+
#include "girl-player-frontend.h"
#include "girl-player-backend.h"
#include "girl-player-globals.h"
+#include "girl-record-backend.h"
+#include "girl-record-frontend.h"
+
extern GirlData *girl;
int
diff --git a/src/girl-station.c b/src/girl-station.c
index dd28312..f47c854 100644
--- a/src/girl-station.c
+++ b/src/girl-station.c
@@ -42,6 +42,7 @@
#include "girl.h"
#include "girl-station.h"
#include "girl-player.h"
+#include "girl-record.h"
extern GirlData *girl;
extern GList *girl_stations;
@@ -186,16 +187,17 @@ void girl_helper_run(gchar *url, gchar *name, GirlStreamType type, GirlHelperTyp
/* app = (gchar *)gnome_vfs_mime_get_default_application (mime_info); */
// girl_player_main(url, girl->selected_station_name);
-
+
if (helper == GIRL_STREAM_PLAYER) {
- app = g_strdup(GIRL_HELPER_PLAYER);
girl_player_main(url, girl->selected_station_name);
}
if (helper == GIRL_STREAM_RECORD) {
- app = g_strdup(GIRL_HELPER_RECORD);
girl_record_main(url, girl->selected_station_name);
}
+
+ return;
+
#if 0
if (g_strcmp0(app,"no")!=0) {
command = g_strconcat(app, " ", url, NULL);
@@ -349,8 +351,6 @@ void girl_helper_run(gchar *url, gchar *name, GirlStreamType type, GirlHelperTyp
* will clean any remnants of process. */
g_child_watch_add( girl->player_pid, (GChildWatchFunc)cb_child_watch_player, girl );
#endif
-#endif
-
/* Original async player code */
girl->player_launcher = g_subprocess_launcher_new (G_SUBPROCESS_FLAGS_NONE);
@@ -367,6 +367,7 @@ void girl_helper_run(gchar *url, gchar *name, GirlStreamType type, GirlHelperTyp
GIRL_DEBUG_MSG("Launching %s player\n", command);
}
+#endif
#if 0
if (!g_spawn_command_line_async(command, &err)) {
msg = g_strdup_printf(_("Failed to open URL: '%s'\n"
@@ -488,7 +489,6 @@ void girl_helper_run(gchar *url, gchar *name, GirlStreamType type, GirlHelperTyp
#endif
#endif
}
-#endif
quit_player:
@@ -501,7 +501,7 @@ quit_record:
g_object_unref(girl->record_subprocess);
if (girl->record_launcher)
g_object_unref(girl->record_launcher);
-
+#endif
}
void girl_stream_player(GtkWidget * widget, gpointer data)
@@ -726,7 +726,8 @@ GirlStationInfo *girl_station_load_from_file(GirlStationInfo * head,
}
gint girl_station_update (GirlStationInfo *head, gchar *station_band, gchar *station_description, gchar
*station_name, gchar *station_location, gchar *station_uri, gchar *station_website) {
-
+ gchar msg[256];
+ gchar *msg1, *msg2;
/* Open ~/.girl/girl.xml. Parse structure. Insert new item. Save structure. */
GirlStationInfo *new_station;
GirlStationInfo *stationinfo;
@@ -779,5 +780,6 @@ gint girl_station_update (GirlStationInfo *head, gchar *station_band, gchar *sta
g_free(stations);
g_free(new_station);
g_free(stationinfo);
+
return (0);
}
diff --git a/src/girl.c b/src/girl.c
index 2bd9e0d..7a428e2 100644
--- a/src/girl.c
+++ b/src/girl.c
@@ -181,6 +181,7 @@ static void cause_movement(int way)
void on_previous_station_click(GtkWidget * a, gpointer user_data)
{
GirlStationInfo *station = (GirlStationInfo *)girl->previous_station;
+
girl->previous_station = girl->selected_station;
if (station != NULL) {
@@ -231,6 +232,7 @@ void on_previous_station_click(GtkWidget * a, gpointer user_data)
void on_next_station_click(GtkWidget * a, gpointer user_data)
{
GList *l = g_list_first(girl_stations);
+ girl_player_frontend_stop (girl->player_window, NULL);
girl->previous_station = (GirlStationInfo*)girl->selected_station;
if (l != NULL) {
GirlStationInfo *station = l->data;
@@ -480,6 +482,7 @@ void on_stations_selector_changed(GtkWidget * a, gpointer user_data)
station->name = g_strdup(g_object_get_data(G_OBJECT(a), "station_name"));
/* girl_history = g_list_add(GLIST(girl_history), (GirlStationInfo *)station); */
+ girl_player_frontend_stop(girl->player_window, NULL);
girl_helper_run(girl->selected_station_uri,
girl->selected_station_name,
GIRL_STREAM_SHOUTCAST,
@@ -629,9 +632,11 @@ void quit_app(GtkWidget * a, gpointer user_data)
}
// stationinfo = l->data;
// girl_station_save(stationinfo, NULL, NULL, NULL, NULL, NULL, NULL);
+
g_spawn_close_pid(girl->record_pid);
g_spawn_close_pid(girl->player_pid);
+
g_subprocess_force_exit(girl->player_subprocess);
g_subprocess_force_exit(girl->record_subprocess);
// kill(girl->record_pid,SIGHUP);
@@ -649,7 +654,12 @@ void quit_app(GtkWidget * a, gpointer user_data)
void about_rec(GtkWidget * a, gpointer user_data)
{
static GtkWindow *about = NULL;
- about = gtk_message_dialog_new(girl_app,GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO, "Recording is not yet implemented. If you want to implement it, send an email to ole src
gnome org with a patch.");
+ about = GTK_WINDOW(gtk_message_dialog_new(GTK_WINDOW(girl_app),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_YES_NO,
+ "Recording is not yet implemented. If you want to
implement it, see src/girl-record.c and send an email to ole src gnome org with the patch."));
+
gtk_dialog_run(GTK_DIALOG(about));
}
@@ -693,7 +703,7 @@ void about_app(GtkWidget * a, gpointer user_data)
NULL };
gchar* comments = { _("Locate Internet Radio Stations") };
gchar* copyright = { _("Copyright (C) 2014, 2015, 2016 Ole Aamot Software") };
- gchar* documenters[] = { _("Mario Blättermann <mario blaettermann gmail com> (German translation)"),
_("Marek Černocký <marek manet cz> (Czech translation)"), _("Daniel Mustieles <daniel mustieles gmail com>
(Spanish translation)"), NULL };
+ gchar* documenters[] = { _("Mario Blättermann <mario blaettermann gmail com> (German translation)"),
_("Marek Černocký <marek manet cz> (Czech translation)"), _("Daniel Mustieles <daniel mustieles gmail com>
(Spanish translation)"), _("Josef Andersson <josef andersson fripost org> (Swedish translation)"), NULL };
static GdkPixbuf* logo;
@@ -877,12 +887,10 @@ void on_listen_button_clicked(GtkWidget *a, gpointer user_data)
girl->selected_station_location,
girl->selected_station_uri,
girl->selected_station_band);
- g_print ("BEFORE %s\n", __FUNCTION__);
girl_helper_run(girl->selected_station_uri,
girl->selected_station_name,
GIRL_STREAM_SHOUTCAST,
GIRL_STREAM_PLAYER);
- g_print ("AFTER %s\n", __FUNCTION__);
}
void on_record_button_clicked(GtkWidget *a, gpointer user_data)
@@ -895,7 +903,7 @@ void on_record_button_clicked(GtkWidget *a, gpointer user_data)
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- "Record is not yet implemented!\nYou are welcome to send a patch!");
+ "Recording is not yet implemented. If you want to implement it, see
src/girl-record.c and send an email to ole src gnome org with the patch.");
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
diff --git a/src/girl.xml b/src/girl.xml
index 85ecbe3..fd01448 100644
--- a/src/girl.xml
+++ b/src/girl.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="girl.xsl" ?>
-<!DOCTYPE girl SYSTEM "girl-9.5.dtd">
-<girl version="9.5.3">
+<!DOCTYPE girl SYSTEM "girl-9.6.dtd">
+<girl version="9.6.0">
<station band="909/693 MW" id="bbcradio5live" lang="en" name="BBC Radio 5 Live" rank="1.0" type="gov">
<frequency uri="http://www.bbc.co.uk/5live";>909/693 MW in Salford, United Kingdom</frequency>
<location>Salford, United Kingdom</location>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
