Commit eab20922 authored by Ole Aamot's avatar Ole Aamot

GNOME Radio 0.2.0

parent e8814f72
2019-09-10 Ole Aamot <ole@gnome.org>
* GNOME Radio version 0.2.0
2019-09-09 Ole Aamot <ole@gnome.org>
* gnome-radio-main.c: Add KHPR (Hawaii)
......
=============
Version 0.2.0
=============
XML (gnome-radio.xml)
* Hawaii Public Radio (KHPR)
* New York City Public Radio (WNYC)
* Southern California Public Radio (SCPR)
=============
Version 0.1.0
=============
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for gnome-radio 0.1.9.
# Generated by GNU Autoconf 2.69 for gnome-radio 0.2.0.
#
# Report bugs to <ole@gnome.org>.
#
......@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='gnome-radio'
PACKAGE_TARNAME='gnome-radio'
PACKAGE_VERSION='0.1.9'
PACKAGE_STRING='gnome-radio 0.1.9'
PACKAGE_VERSION='0.2.0'
PACKAGE_STRING='gnome-radio 0.2.0'
PACKAGE_BUGREPORT='ole@gnome.org'
PACKAGE_URL=''
......@@ -1246,7 +1246,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 gnome-radio 0.1.9 to adapt to many kinds of systems.
\`configure' configures gnome-radio 0.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1313,7 +1313,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of gnome-radio 0.1.9:";;
short | recursive ) echo "Configuration of gnome-radio 0.2.0:";;
esac
cat <<\_ACEOF
......@@ -1412,7 +1412,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
gnome-radio configure 0.1.9
gnome-radio configure 0.2.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1467,7 +1467,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 gnome-radio $as_me 0.1.9, which was
It was created by gnome-radio $as_me 0.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2335,7 +2335,7 @@ fi
# Define the identity of the package.
PACKAGE='gnome-radio'
VERSION='0.1.9'
VERSION='0.2.0'
cat >>confdefs.h <<_ACEOF
......@@ -4285,7 +4285,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 gnome-radio $as_me 0.1.9, which was
This file was extended by gnome-radio $as_me 0.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -4351,7 +4351,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="\\
gnome-radio config.status 0.1.9
gnome-radio config.status 0.2.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
AC_INIT([gnome-radio], [0.1.9], [ole@gnome.org])
AC_INIT([gnome-radio], [0.2.0], [ole@gnome.org])
AC_CONFIG_SRCDIR([src/gnome-radio-main.c])
AC_CONFIG_HEADERS([config.h])
......
......@@ -6,6 +6,7 @@
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
#include "gnome-radio-file.h"
#include "gnome-radio-vosc.h"
#define RADIO_MARKER_SIZE 10
#if 0
......@@ -55,74 +56,6 @@ init_radio_window (RadioWindow *window) {
}
#endif
/*
gnome-radio draws the radio_marker wth Cairo composed of 1 static
filled circle and 1 stroked circle animated as echo.
*/
static ClutterActor *
create_oscilloscope_visual (void)
{
ClutterActor *oscilloscope_visual;
ClutterActor *bg;
ClutterTimeline *timeline;
cairo_t *cr;
/* Create the marker */
oscilloscope_visual = champlain_custom_marker_new ();
/* Static filled circle ------------------------------------------ */
bg = clutter_cairo_texture_new (RADIO_MARKER_SIZE, RADIO_MARKER_SIZE);
cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (bg));
cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
cairo_paint(cr);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
/* Draw the circle */
cairo_set_source_rgb (cr, 0, 0, 0);
cairo_arc (cr, RADIO_MARKER_SIZE / 8.0,
RADIO_MARKER_SIZE / 8.0,
RADIO_MARKER_SIZE / 8.0, 0, 2 * M_PI);
cairo_close_path (cr);
/* Fill the circle */
cairo_set_source_rgba (cr, 0.1, 0.9, 0.1, 1.0);
cairo_fill (cr);
cairo_destroy (cr);
/* Add the circle to the radio_marker */
clutter_container_add_actor (CLUTTER_CONTAINER (oscilloscope_visual), bg);
clutter_actor_set_anchor_point_from_gravity (bg, CLUTTER_GRAVITY_CENTER);
clutter_actor_set_position (bg, 0, 0);
/* Echo circle ----------------------------------------------- */
bg = clutter_cairo_texture_new (2 * RADIO_MARKER_SIZE,
2 * RADIO_MARKER_SIZE);
cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (bg));
/* Draw the circle */
cairo_set_source_rgb (cr, 0, 0, 0);
cairo_arc (cr, RADIO_MARKER_SIZE, RADIO_MARKER_SIZE,
0.9 * RADIO_MARKER_SIZE, 0, 2 * M_PI);
cairo_close_path (cr);
/* Stroke the circle */
cairo_set_line_width (cr, 2.0);
cairo_set_source_rgba (cr, 0.1, 0.7, 0.1, 1.0);
cairo_stroke (cr);
cairo_destroy (cr);
/* Add the circle to the radio_marker */
clutter_container_add_actor (CLUTTER_CONTAINER (oscilloscope_visual), bg);
clutter_actor_lower_bottom (bg); /* Ensure it is under the previous circle */
clutter_actor_set_position (bg, 0, 0);
clutter_actor_set_anchor_point_from_gravity (bg,
CLUTTER_GRAVITY_CENTER);
/* Animate the echo circle */
timeline = clutter_timeline_new (1000);
clutter_timeline_set_loop (timeline, TRUE);
clutter_actor_set_opacity (CLUTTER_ACTOR (bg), 255);
clutter_actor_set_scale (CLUTTER_ACTOR (bg), 0.5, 0.5);
clutter_actor_animate_with_timeline (CLUTTER_ACTOR (bg),
CLUTTER_EASE_OUT_SINE,
timeline,
"opacity", 0,
"scale-x", 2.0,
"scale-y", 2.0,
NULL);
clutter_timeline_start (timeline);
return oscilloscope_visual;
}
/*
gnome-radio draws the radio_marker wth Cairo composed of 1 static
filled circle and 1 stroked circle animated as echo.
......@@ -209,10 +142,6 @@ typedef struct
static gboolean
gps_callback (GpsCallbackData *data)
{
lat += 0.005;
lon -= 0.005;
lat -= 0.005;
lon += 0.005;
champlain_view_center_on (data->view, lat, lon);
champlain_location_set_location (CHAMPLAIN_LOCATION (data->radio_marker), lat, lon);
return TRUE;
......@@ -228,11 +157,11 @@ main (gint argc, gchar **argv)
ChamplainMarkerLayer *layer;
RadioInfo *radioinfo;
GpsCallbackData callback_data;
OscilloscopeCallbackData oscilloscope_data;
/* OscilloscopeCallbackData oscilloscope_data; */
/* VOSCWindow *vosc; */
if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
return 1;
/* vosc = (VOSCWindow *)g_new0(VOSCWindow, 1); */
stage = clutter_stage_new ();
clutter_stage_set_title (stage, g_strconcat("GNOME Radio", " ", VERSION, " - ", "http://www.gnomeradio.org/", " - ", "https://wiki.gnome.org/Apps/Radio", NULL));
clutter_actor_set_size (stage, 800, 600);
......@@ -249,10 +178,10 @@ main (gint argc, gchar **argv)
radio_marker = create_radio_marker ();
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (radio_marker));
/* Create a oscilloscope_visual */
oscilloscope_visual = create_oscilloscope_visual ();
/* oscilloscope_visual = create_oscilloscope_visual (); */
/* gnome_radio_add_visual_oscilloscope (layer, GNOME_RADIO_MARKER (oscilloscope_visual)); */
/* Finish initialising the map view */
g_object_set (G_OBJECT (actor), "zoom-level", 12,
g_object_set (G_OBJECT (actor), "zoom-level", 1,
"kinetic-mode", TRUE, NULL);
champlain_view_center_on (CHAMPLAIN_VIEW (actor), lat, lon);
/* Create callback that updates the map periodically */
......@@ -267,14 +196,14 @@ main (gint argc, gchar **argv)
gst_player_stop (GST_PLAYER (player));
/* Visual Oscillator */
/* vosc->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); */
/* gtk_window_show_all (vosc->window); */
gnome_radio_real(GST_PLAYER (player), CLUTTER_ACTOR (radio_oscilloscope));
clutter_container_add_actor (CLUTTER_CONTAINER (stage), CLUTTER_ACTOR (radio_oscilloscope));
/* gtk_widget_show_all (vosc->window); */
/* gnome_radio_real(GST_PLAYER (player), CLUTTER_ACTOR (radio_oscilloscope)); */
/* clutter_container_add_actor (CLUTTER_CONTAINER (stage), CLUTTER_ACTOR (radio_oscilloscope)); */
gst_player_play(GST_PLAYER (player));
g_timeout_add (1000, (GSourceFunc) gps_callback, &callback_data);
g_timeout_add (1000, (GSourceFunc) gnome_radio_real, &oscilloscope_data);
/* g_timeout_add (1000, (GSourceFunc) gnome_radio_real, &oscilloscope_data); */
clutter_actor_show (stage);
clutter_actor_show (radio_oscilloscope);
/* clutter_actor_show (radio_oscilloscope); */
clutter_main ();
return (0);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment