[SCM] gsequencer/master: adding patches
jkraehemann-guest at users.alioth.debian.org
jkraehemann-guest at users.alioth.debian.org
Fri Jun 19 16:24:40 UTC 2015
The following commit has been merged in the master branch:
commit 5a5873058b926ff5c4281d7cafb66bbda282cd2d
Author: Joël Krähemann <jkraehemann at gmail.com>
Date: Fri Jun 19 18:02:38 2015 +0200
adding patches
diff --git a/debian/patches/fixed-audio-preferences b/debian/patches/fixed-audio-preferences
new file mode 100644
index 0000000..05c3abe
--- /dev/null
+++ b/debian/patches/fixed-audio-preferences
@@ -0,0 +1,253 @@
+Description: Due the soundcard wasn't restored correctly I wrote this changes
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ ags (0.4.2-69-1) unstable; urgency=low
+ .
+ [ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
+ * fixed itp-bug (Closes: #788590)
+ * added ags.xsl and ags_file.dtd
+ .
+ [ Joël Krähemann ]
+Author: Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) <jkraehemann at gmail.com>
+Bug-Debian: https://bugs.debian.org/788590
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- ags-0.4.2-69.orig/src/ags/X/ags_audio_preferences.c
++++ ags-0.4.2-69/src/ags/X/ags_audio_preferences.c
+@@ -312,9 +312,7 @@ ags_audio_preferences_apply(AgsApplicabl
+ ¤t,
+ 0,
+ &value);
+-
+- //FIXME:JK: work-around for alsa-handle
+- str = g_strdup_printf("%s,0", g_value_get_string(&value));
++ str = g_strdup(g_value_get_string(&value));
+ g_message("%s\0", str);
+ ags_config_set(config,
+ AGS_CONFIG_DEVOUT,
+@@ -362,7 +360,7 @@ ags_audio_preferences_reset(AgsApplicabl
+ GtkTreeIter current;
+ GList *card_id, *card_name;
+ GValue value = {0,};
+- char *device, *str, *tmp;
++ char *device, *str;
+ guint nth;
+ gboolean found_card;
+ int card_num;
+@@ -384,20 +382,14 @@ ags_audio_preferences_reset(AgsApplicabl
+ str = ags_config_get(config,
+ AGS_CONFIG_DEVOUT,
+ "alsa-handle\0");
+- g_message("%s\0", str);
+ nth = 0;
+ found_card = FALSE;
+
+ while(card_id != NULL){
+- //FIXME:JK: work-around for alsa-handle
+- tmp = g_strdup_printf("%s,0\0",
+- card_id->data);
+- if(!g_ascii_strcasecmp(tmp,
++ if(!g_ascii_strcasecmp(card_id->data,
+ str)){
+ found_card = TRUE;
+ }
+-
+- g_free(tmp);
+
+ if(!found_card){
+ nth++;
+@@ -426,6 +418,9 @@ ags_audio_preferences_reset(AgsApplicabl
+ "buffer_size\0", &buffer_size,
+ NULL);
+
++
++ error = NULL;
++
+ /* */
+ gtk_spin_button_set_value(audio_preferences->audio_channels,
+ (gdouble) channels);
+@@ -447,8 +442,6 @@ ags_audio_preferences_reset(AgsApplicabl
+ 0,
+ &value);
+ str = g_strdup(g_value_get_string(&value));
+-
+- error = NULL;
+ ags_devout_pcm_info(str,
+ &channels_min, &channels_max,
+ &rate_min, &rate_max,
+--- ags-0.4.2-69.orig/src/ags/X/ags_audio_preferences.h
++++ ags-0.4.2-69/src/ags/X/ags_audio_preferences.h
+@@ -34,7 +34,7 @@ typedef struct _AgsAudioPreferencesClass
+ struct _AgsAudioPreferences
+ {
+ GtkVBox vbox;
+-
++
+ GtkComboBox *card;
+ GtkSpinButton *audio_channels;
+ GtkSpinButton *samplerate;
+--- ags-0.4.2-69.orig/src/ags/X/ags_audio_preferences_callbacks.c
++++ ags-0.4.2-69/src/ags/X/ags_audio_preferences_callbacks.c
+@@ -77,14 +77,8 @@ ags_audio_preferences_card_changed_callb
+ AgsSetOutputDevice *set_output_device;
+ GtkListStore *model;
+ GtkTreeIter current;
+- gchar *str;
+- guint channels, channels_min, channels_max;
+- guint rate, rate_min, rate_max;
+- guint buffer_size, buffer_size_min, buffer_size_max;
+ GValue value = {0,};
+-
+- GError *error;
+-
++
+ window = AGS_WINDOW(AGS_PREFERENCES(gtk_widget_get_ancestor(GTK_WIDGET(audio_preferences),
+ AGS_TYPE_PREFERENCES))->window);
+ devout = AGS_DEVOUT(window->devout);
+@@ -101,49 +95,16 @@ ags_audio_preferences_card_changed_callb
+ 0,
+ &value);
+
+- str = g_strdup(g_value_get_string(&value));
+-
+ /* create set output device task */
+ set_output_device = ags_set_output_device_new((GObject *) devout,
+- str);
++ g_strdup(g_value_get_string(&value)));
+
+ /* append AgsSetOutputDevice */
+ ags_task_thread_append_task(AGS_TASK_THREAD(AGS_AUDIO_LOOP(AGS_MAIN(devout->ags_main)->main_loop)->task_thread),
+ AGS_TASK(set_output_device));
+
+ /* reset dialog */
+- error = NULL;
+- ags_devout_pcm_info(str,
+- &channels_min, &channels_max,
+- &rate_min, &rate_max,
+- &buffer_size_min, &buffer_size_max,
+- &error);
+-
+- if(error != NULL){
+- GtkMessageDialog *dialog;
+-
+- dialog = (GtkMessageDialog *) gtk_message_dialog_new((GtkWindow *) gtk_widget_get_ancestor(GTK_WIDGET(audio_preferences),
+- AGS_TYPE_PREFERENCES),
+- GTK_DIALOG_MODAL,
+- GTK_MESSAGE_ERROR,
+- GTK_BUTTONS_CLOSE,
+- "%s\0", error->message);
+- gtk_dialog_run(GTK_DIALOG(dialog));
+- gtk_widget_destroy(GTK_WIDGET(dialog));
+-
+- gtk_spin_button_set_range(audio_preferences->audio_channels, 0.0, 24.0);
+- gtk_spin_button_set_range(audio_preferences->samplerate, 1.0, 192000.0);
+- gtk_spin_button_set_range(audio_preferences->buffer_size, 1.0, 65535.0);
+-
+- return;
+- }
+-
+- gtk_spin_button_set_range(audio_preferences->audio_channels,
+- channels_min, channels_max);
+- gtk_spin_button_set_range(audio_preferences->samplerate,
+- rate_min, rate_max);
+- gtk_spin_button_set_range(audio_preferences->buffer_size,
+- buffer_size_min, buffer_size_max);
++ ags_audio_preferences_reset(audio_preferences);
+ }
+
+ void
+--- ags-0.4.2-69.orig/src/ags/audio/ags_config.c
++++ ags-0.4.2-69/src/ags/audio/ags_config.c
+@@ -223,7 +223,7 @@ ags_config_load_defaults(AgsConfig *conf
+ ags_config_set(config, ags_config_devout, "buffer-size\0", "940\0");
+ ags_config_set(config, ags_config_devout, "pcm-channels\0", "2\0");
+ ags_config_set(config, ags_config_devout, "dsp-channels\0", "2\0");
+- ags_config_set(config, ags_config_devout, "alsa-handle\0", "hw:0,0\0");
++ ags_config_set(config, ags_config_devout, "alsa-handle\0", "hw:0\0");
+
+ ags_config_set(config, ags_config_recall, "auto-sense\0", "true\0");
+ }
+@@ -495,10 +495,10 @@ ags_config_set(AgsConfig *config, gchar
+ "alsa-handle\0",
+ 11)){
+ gchar *alsa_handle;
+-
++
+ alsa_handle = value;
+ g_object_set(G_OBJECT(devout),
+- "device\0", g_strdup_printf("%s\0", alsa_handle),
++ "device\0", alsa_handle,
+ NULL);
+ }
+ }
+--- ags-0.4.2-69.orig/src/ags/audio/ags_devout.c
++++ ags-0.4.2-69/src/ags/audio/ags_devout.c
+@@ -924,8 +924,8 @@ ags_devout_list_cards(GList **card_id, G
+ snd_ctl_t *card_handle;
+ snd_ctl_card_info_t *card_info;
+ char *name;
+- gchar *str, *tmp;
+- int card_num, dev_num;
++ gchar *str;
++ int card_num;
+ int error;
+
+ *card_id = NULL;
+@@ -943,10 +943,9 @@ ags_devout_list_cards(GList **card_id, G
+ continue;
+ }
+
+- tmp =
+- str = g_strdup_printf("hw:%i\0", card_num);
++ str = g_strdup_printf("hw:%i\0", card_num);
+ error = snd_ctl_open(&card_handle, str, 0);
+-
++
+ if(error < 0){
+ continue;
+ }
+@@ -992,7 +991,6 @@ ags_devout_pcm_info(char *card_id,
+ guint *buffer_size_min, guint *buffer_size_max,
+ GError **error)
+ {
+- char *str;
+ int rc;
+ snd_pcm_t *handle;
+ snd_pcm_hw_params_t *params;
+@@ -1004,7 +1002,7 @@ ags_devout_pcm_info(char *card_id,
+
+ /* Open PCM device for playback. */
+ handle = NULL;
+-
++
+ rc = snd_pcm_open(&handle, card_id, SND_PCM_STREAM_PLAYBACK, 0);
+
+ if(rc < 0) {
+--- ags-0.4.2-69.orig/src/ags/main.c
++++ ags-0.4.2-69/src/ags/main.c
+@@ -821,8 +821,7 @@ main(int argc, char **argv)
+ if(!strncmp(argv[i], "--help\0", 7)){
+ printf("GSequencer `ags` is an audio sequencer and notation editor\n\n\0");
+
+- printf("Usage:\n\t%s\n\t%s\n\t%s\n\t%s\n\n",
+- "Report bugs to <jkraehemann at gmail.com>\n\0",
++ printf("Usage:\n\t%s\n\t%s\n\t%s\n\t%s\n\nReport bugs to <jkraehemann at gmail.com>\n\0",
+ "--filename file open file\0",
+ "--single-thread run in single thread mode\0",
+ "--help display this help and exit\0",
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0af9cdd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fixed-audio-preferences
--
gsequencer packaging
More information about the pkg-multimedia-commits
mailing list