Commit d1fdda2c authored by Ole Aamot's avatar Ole Aamot

Update marker code

parent f777a777
......@@ -313,18 +313,18 @@ GtkWidget *create_new_station_selector(gchar *location) {
}
stationinfo = gnome_internet_radio_locator_station_load_from_file(localstation,
world_station_xml_filename);
gtk_widget_show(nameentry);
gtk_widget_show(locationentry);
gtk_widget_show(urientry);
gtk_widget_show(bandentry);
gtk_widget_show(descriptionentry);
gtk_widget_show(websiteentry);
gtk_container_add(GTK_CONTAINER(content_area), nameentry);
gtk_container_add(GTK_CONTAINER(content_area), bandentry);
gtk_container_add(GTK_CONTAINER(content_area), locationentry);
gtk_container_add(GTK_CONTAINER(content_area), urientry);
gtk_container_add(GTK_CONTAINER(content_area), descriptionentry);
gtk_container_add(GTK_CONTAINER(content_area), websiteentry);
gtk_widget_show(nameentry);
gtk_widget_show(bandentry);
gtk_widget_show(locationentry);
gtk_widget_show(urientry);
gtk_widget_show(descriptionentry);
gtk_widget_show(websiteentry);
/* g_signal_connect(G_OBJECT(station_selector), GTK_RESPONSE_ACCEPT, */
/* G_CALLBACK(on_new_station_selector_changed), */
/* NULL); */
......
......@@ -170,7 +170,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
/* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
station = g_strdup("Boston, Massachusetts\n<span size=\"small\">http://www.wtburadio.org/</span>");
station = g_strdup("Boston, Massachusetts\n<span size=\"small\">WTBU</span>");
champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
......@@ -203,7 +203,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
/* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
station = g_strdup("WHRB-FM, Cambridge, Massachusetts\n<span size=\"small\">http://www.whrb.org/</span>");
station = g_strdup("WHRB-FM, Cambridge, Massachusetts\n<span size=\"small\">WHRB</span>");
champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
......@@ -214,7 +214,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
/* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
station = g_strdup("WMBR-FM, Cambridge, Massachusetts\n<span size=\"small\">http://www.wmbr.org/</span>");
station = g_strdup("WMBR-FM, Cambridge, Massachusetts\n<span size=\"small\">WMBR</span>");
champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
......
......@@ -631,14 +631,6 @@ WUMR has been the University of Memphis broadcasting outlet since 1979, when Sou
<stream mime="audio/mpeg" uri="http://audio.wpts.pitt.edu:8000/wpts_live_96s.mp3" codec="MPEG 1 Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="96 kbps" />
<stream mime="audio/mpeg" uri="http://audio.wpts.pitt.edu:8000/wpts_live_48s.mp3" codec="MPEG 1 Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="48 kbps" />
</station>
<station band="1330AM" id="wtbu" lang="en" name="WTBU" rank="1.0" type="edu">
<frequency uri="http://www.wtburadio.org/">89.3 FM in Boston, Massachusetts</frequency>
<location>Boston, Massachusetts</location>
<description lang="en">
WTBU is BU's student-run, volunteer radio station which broadcasts live 20 hours a day. Our station is primarily available through our webcast, but you can also listen to us on 89.3 FM/640 AM if you're in Boston, or on BU's cable channel 6 if you live on campus.
</description>
<stream mime="audio/mpeg" uri="http://wtbu.bu.edu:1800/listen" codec="MPEG 1 Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="191 kbps" />
</station>
<station band="1330AM" id="kasc" lang="en" name="Arizona State University" rank="1.0" type="edu">
<frequency uri="http://www.blazeradioonline.com/">1330 AM in Phoenix, Arizona</frequency>
<location>Phoenix, Arizona</location>
......@@ -1005,6 +997,12 @@ Behind the scenes we rely on our fantastic technical, musical and promotional te
<stream mime="audio/mpeg" uri="http://icecast.media.berkeley.edu:8000/kalx-128.mp3" codec="MPEG 1 Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
<uri>http://kalx.berkeley.edu/</uri>
</station>
<station band="1330AM" id="wtbu" lang="en" name="WTBU" rank="1.0" type="edu">
<frequency uri="http://www.wtburadio.org/">89.3 FM in Boston, Massachusetts</frequency>
<location>Boston, Massachusetts</location>
<description lang="en">WTBU is BU's student-run, volunteer radio station which broadcasts live 20 hours a day. Our station is primarily available through our webcast, but you can also listen to us on 89.3 FM/640 AM if you're in Boston, or on BU's cable channel 6 if you live on campus.</description>
<stream mime="audio/mpeg" uri="http://wtbu.bu.edu:1800/listen" codec="MPEG 1 Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="191 kbps" />
</station>
<station band="95.3FM" id="whrb" lang="en" name="WHRB" rank="1.0" type="edu">
<frequency uri="http://www.whrb.org/">95.3 FM in Cambridge, Massachusetts</frequency>
<location>WHRB-FM, Cambridge, Massachusetts</location>
......
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