← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnomeradio/trusty

« back to all changes in this revision

Viewing changes to debian/patches/gnomeradio-media_types.patch

  • Committer: Package Import Robot
  • Author(s): POJAR GEORGE
  • Date: 2013-09-11 15:06:44 UTC
  • Revision ID: package-import@ubuntu.com-20130911150644-l8x3ubsyqmrvnkh8
Tags: 1.8-2ubuntu20
* Updated debian/patches/gnomeradio-station_list.patch: Prevent to parse
  malformed/incomplete/invalid XML file.
* Updated debian/patches/gnomeradio-auto_device.patch:
  - Automatically detect radio device when users type auto in settings field.
  - Updated error messages to be clear and precise.
* Updated debian/patches/gnomeradio-alsamixer.patch: Make presets list the
  default widget when open settings dialog. Presets are the most common
  settings for users than devices settings.
* Updated debian/patches/gnomeradio-about.patch: It is not safe in principle
  to write raw UTF-8 in narrow string literals, made to be multibyte
  encodings.
* debian/patches/gnomeradio-prefs.patch: Renamed to
  debian/patches/gnomeradio-about.patch.
* debian/patches/gnomeradio-preferences.patch: Make sentence capitalization in
  text and increased preferences dialog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/gnomeradio-media_types.patch
3
3
Author: POJAR GEORGE <geoubuntu@gmail.com>
4
4
Index: gnomeradio-1.8/configure.in
5
5
===================================================================
6
 
--- gnomeradio-1.8.orig/configure.in    2013-09-08 16:48:51.310426751 +0000
7
 
+++ gnomeradio-1.8/configure.in 2013-09-08 16:48:51.298426751 +0000
 
6
--- gnomeradio-1.8.orig/configure.in    2013-09-13 05:32:30.438571056 +0000
 
7
+++ gnomeradio-1.8/configure.in 2013-09-13 05:32:30.430571057 +0000
8
8
@@ -26,11 +26,11 @@
9
9
 AC_SUBST(ALSA_CFLAGS)
10
10
 AC_SUBST(ALSA_LIBS)
22
22
Index: gnomeradio-1.8/data/gnomeradio.gep
23
23
===================================================================
24
24
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
25
 
+++ gnomeradio-1.8/data/gnomeradio.gep  2013-09-08 16:48:51.298426751 +0000
 
25
+++ gnomeradio-1.8/data/gnomeradio.gep  2013-09-13 05:32:30.430571057 +0000
26
26
@@ -0,0 +1,49 @@
27
27
+[GStreamer Encoding Target]
28
28
+name = gnomeradio
75
75
+presence = 1
76
76
Index: gnomeradio-1.8/data/Makefile.am
77
77
===================================================================
78
 
--- gnomeradio-1.8.orig/data/Makefile.am        2013-09-08 16:48:51.310426751 +0000
79
 
+++ gnomeradio-1.8/data/Makefile.am     2013-09-08 16:48:51.298426751 +0000
 
78
--- gnomeradio-1.8.orig/data/Makefile.am        2013-09-13 05:32:30.438571056 +0000
 
79
+++ gnomeradio-1.8/data/Makefile.am     2013-09-13 05:32:30.430571057 +0000
80
80
@@ -5,6 +5,9 @@
81
81
 applications_DATA = $(applications_in_files:.desktop.in=.desktop)
82
82
 @INTLTOOL_DESKTOP_RULE@
90
90
Index: gnomeradio-1.8/src/rb_missing_plugins.c
91
91
===================================================================
92
92
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
93
 
+++ gnomeradio-1.8/src/rb_missing_plugins.c     2013-09-08 16:48:51.298426751 +0000
 
93
+++ gnomeradio-1.8/src/rb_missing_plugins.c     2013-09-13 05:32:30.430571057 +0000
94
94
@@ -0,0 +1,253 @@
95
95
+/* rb_missing_plugins.c
96
96
+
348
348
Index: gnomeradio-1.8/src/rb_missing_plugins.h
349
349
===================================================================
350
350
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
351
 
+++ gnomeradio-1.8/src/rb_missing_plugins.h     2013-09-08 16:48:51.298426751 +0000
 
351
+++ gnomeradio-1.8/src/rb_missing_plugins.h     2013-09-13 05:32:30.430571057 +0000
352
352
@@ -0,0 +1,33 @@
353
353
+/* rb_missing_plugins.h
354
354
+
386
386
Index: gnomeradio-1.8/src/rb_gst_media_types.c
387
387
===================================================================
388
388
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
389
 
+++ gnomeradio-1.8/src/rb_gst_media_types.c     2013-09-08 16:48:51.298426751 +0000
 
389
+++ gnomeradio-1.8/src/rb_gst_media_types.c     2013-09-13 05:32:30.430571057 +0000
390
390
@@ -0,0 +1,338 @@
391
391
+/*
392
392
+ *  Copyright (C) 2010  Jonathan Matthew  <jonathan@d14n.org>
729
729
Index: gnomeradio-1.8/src/rb_gst_media_types.h
730
730
===================================================================
731
731
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
732
 
+++ gnomeradio-1.8/src/rb_gst_media_types.h     2013-09-08 16:48:51.298426751 +0000
 
732
+++ gnomeradio-1.8/src/rb_gst_media_types.h     2013-09-13 05:32:30.430571057 +0000
733
733
@@ -0,0 +1,76 @@
734
734
+/*
735
735
+ *  Copyright (C) 2010  Jonathan Matthew <jonathan@d14n.org>
809
809
+#endif /* __MEDIA_TYPES_H */
810
810
Index: gnomeradio-1.8/data/gnomeradio.schemas.in
811
811
===================================================================
812
 
--- gnomeradio-1.8.orig/data/gnomeradio.schemas.in      2013-09-08 16:48:51.310426751 +0000
813
 
+++ gnomeradio-1.8/data/gnomeradio.schemas.in   2013-09-08 16:48:51.298426751 +0000
 
812
--- gnomeradio-1.8.orig/data/gnomeradio.schemas.in      2013-09-13 05:32:30.438571056 +0000
 
813
+++ gnomeradio-1.8/data/gnomeradio.schemas.in   2013-09-13 05:32:30.430571057 +0000
814
814
@@ -89,10 +89,10 @@
815
815
       <applyto>/apps/gnomeradio/recording/profile</applyto>
816
816
       <owner>gnomeradio</owner>
827
827
 
828
828
Index: gnomeradio-1.8/src/Makefile.am
829
829
===================================================================
830
 
--- gnomeradio-1.8.orig/src/Makefile.am 2013-09-08 16:48:51.310426751 +0000
831
 
+++ gnomeradio-1.8/src/Makefile.am      2013-09-08 16:48:51.298426751 +0000
 
830
--- gnomeradio-1.8.orig/src/Makefile.am 2013-09-13 05:32:30.438571056 +0000
 
831
+++ gnomeradio-1.8/src/Makefile.am      2013-09-13 05:32:30.434571056 +0000
832
832
@@ -18,6 +18,8 @@
833
833
        mixer.h                 \
834
834
        prefs.h                 \
849
849
        trayicon.c              \
850
850
Index: gnomeradio-1.8/src/rec_tech.c
851
851
===================================================================
852
 
--- gnomeradio-1.8.orig/src/rec_tech.c  2013-09-08 16:48:51.310426751 +0000
853
 
+++ gnomeradio-1.8/src/rec_tech.c       2013-09-08 16:48:51.302426751 +0000
 
852
--- gnomeradio-1.8.orig/src/rec_tech.c  2013-09-13 05:32:30.438571056 +0000
 
853
+++ gnomeradio-1.8/src/rec_tech.c       2013-09-13 05:32:30.434571056 +0000
854
854
@@ -18,17 +18,19 @@
855
855
 #include "rec_tech.h"
856
856
 #include <gtk/gtk.h>
1236
1236
 /*
1237
1237
Index: gnomeradio-1.8/src/gui.c
1238
1238
===================================================================
1239
 
--- gnomeradio-1.8.orig/src/gui.c       2013-09-08 16:48:51.310426751 +0000
1240
 
+++ gnomeradio-1.8/src/gui.c    2013-09-08 16:48:51.302426751 +0000
 
1239
--- gnomeradio-1.8.orig/src/gui.c       2013-09-13 05:32:30.438571056 +0000
 
1240
+++ gnomeradio-1.8/src/gui.c    2013-09-13 05:32:30.434571056 +0000
1241
1241
@@ -22,7 +22,7 @@
1242
1242
 
1243
1243
 #include <config.h>
1257
1257
 #include "../data/pixmaps/digits.xpm"
1258
1258
 #include "../data/pixmaps/signal.xpm"
1259
1259
 #include "../data/pixmaps/stereo.xpm"
1260
 
@@ -706,27 +709,69 @@
 
1260
@@ -708,27 +711,69 @@
1261
1261
 static int start_recording(const gchar *destination, const char* station, const char* time)
1262
1262
 {
1263
1263
        Recording* recording;
1345
1345
 
1346
1346
        return 1;
1347
1347
 }
1348
 
@@ -1093,8 +1138,8 @@
 
1348
@@ -1095,8 +1140,8 @@
1349
1349
        gtk_widget_set_tooltip_text(stbw_button, _("0.05 MHz Backwards"));
1350
1350
        gtk_widget_set_tooltip_text(stfw_button, _("0.05 MHz Forwards"));
1351
1351
        gtk_widget_set_tooltip_text(about_button, _("About Gnomeradio"));
1356
1356
        gtk_widget_set_tooltip_text(volume_button, _("Adjust the Volume"));
1357
1357
        gtk_widget_set_tooltip_text(quit_button, _("Quit"));
1358
1358
        text = g_strdup_printf(_("Frequency: %.2f MHz"), gtk_adjustment_get_value(adj)/STEPS);
1359
 
@@ -1323,6 +1368,8 @@
 
1359
@@ -1324,6 +1369,8 @@
1360
1360
 
1361
1361
        /* Initizialize GStreamer */
1362
1362
        gst_init(&argc, &argv);
1365
1365
        
1366
1366
        /* Initizialize Gconf */
1367
1367
        if (!gconf_init(argc, argv, &err)) {
1368
 
@@ -1335,7 +1382,6 @@
 
1368
@@ -1336,7 +1383,6 @@
1369
1369
        } else {
1370
1370
                gconf_client_set_global_default_error_handler((GConfClientErrorHandlerFunc)gconf_error_handler);
1371
1371
                gconf_client_set_error_handling(gconf_client_get_default(),  GCONF_CLIENT_HANDLE_ALL);
1375
1375
        load_settings();
1376
1376
Index: gnomeradio-1.8/src/prefs.c
1377
1377
===================================================================
1378
 
--- gnomeradio-1.8.orig/src/prefs.c     2013-09-08 16:48:51.310426751 +0000
1379
 
+++ gnomeradio-1.8/src/prefs.c  2013-09-08 16:48:51.302426751 +0000
 
1378
--- gnomeradio-1.8.orig/src/prefs.c     2013-09-13 05:32:30.438571056 +0000
 
1379
+++ gnomeradio-1.8/src/prefs.c  2013-09-13 05:32:30.434571056 +0000
1380
1380
@@ -16,7 +16,9 @@
1381
1381
 
1382
1382
 #include <gconf/gconf-client.h>
1400
1400
@@ -37,6 +41,8 @@
1401
1401
 static GtkWidget *device_entry, *mixer_entry;
1402
1402
 static GtkWidget *mute_on_exit_cb;
1403
 
 static GtkWidget *save_button, *move_up_button, *move_down_button, *remove_button;
 
1403
 static GtkWidget *save_button, *move_up_button, *move_down_button, *add_button, *remove_button;
1404
1404
+static GtkWidget *audio_profile_combo;
1405
1405
+static GtkWidget *install_plugins_button;
1406
1406
 static GtkWidget *list_view;
1557
1557
 }
1558
1558
 
1559
1559
 static void add_button_clicked_cb(GtkWidget *widget, gpointer data)
1560
 
@@ -1001,14 +1127,15 @@
 
1560
@@ -1059,14 +1185,15 @@
1561
1561
        GtkWidget *s_indent_label, *p_indent_label, *r_indent_label;
1562
1562
        GtkWidget *destination_label;
1563
1563
        GtkWidget *destination_button;
1566
1566
+       GtkWidget *audio_profile_label;
1567
1567
        GtkWidget *device_label, *mixer_label;
1568
1568
        GtkWidget *button_box;
1569
 
        GtkWidget *open_button, *add_button;
 
1569
        GtkWidget *open_button;
1570
1570
        GtkWidget *scrolled_window;
1571
1571
        GtkCellRenderer *cellrenderer;
1572
1572
        GtkTreeViewColumn *list_column;
1575
1575
        gint i;
1576
1576
        char *settings_hdr, *presets_hdr, *record_hdr;
1577
1577
        preset* ps;
1578
 
@@ -1220,22 +1347,35 @@
 
1578
@@ -1278,22 +1405,35 @@
1579
1579
                _("Select a folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
1580
1580
        gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(destination_button), rec_settings.destination);
1581
1581
        
1623
1623
 
1624
1624
Index: gnomeradio-1.8/src/record.c
1625
1625
===================================================================
1626
 
--- gnomeradio-1.8.orig/src/record.c    2013-09-08 16:48:51.310426751 +0000
1627
 
+++ gnomeradio-1.8/src/record.c 2013-09-08 16:48:51.302426751 +0000
 
1626
--- gnomeradio-1.8.orig/src/record.c    2013-09-13 05:32:30.438571056 +0000
 
1627
+++ gnomeradio-1.8/src/record.c 2013-09-13 05:32:30.434571056 +0000
1628
1628
@@ -30,17 +30,20 @@
1629
1629
 #include "rec_tech.h"
1630
1630
 #include "prefs.h"
1798
1798
        return TRUE;
1799
1799
Index: gnomeradio-1.8/src/rec_tech.h
1800
1800
===================================================================
1801
 
--- gnomeradio-1.8.orig/src/rec_tech.h  2013-09-08 16:48:51.310426751 +0000
1802
 
+++ gnomeradio-1.8/src/rec_tech.h       2013-09-08 16:48:51.302426751 +0000
 
1801
--- gnomeradio-1.8.orig/src/rec_tech.h  2013-09-13 05:32:30.438571056 +0000
 
1802
+++ gnomeradio-1.8/src/rec_tech.h       2013-09-13 05:32:30.434571056 +0000
1803
1803
@@ -16,6 +16,7 @@
1804
1804
 
1805
1805
 #ifndef _REC_TECH_H