[SCM] gsequencer/upstream: New upstream version 0.4.2.80

jkraehemann-guest at users.alioth.debian.org jkraehemann-guest at users.alioth.debian.org
Wed Jun 24 20:04:27 UTC 2015


The following commit has been merged in the upstream branch:
commit 132ed10304a0b697656ebccb2c116a89b667a13e
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date:   Wed Jun 24 21:56:03 2015 +0200

    New upstream version 0.4.2.80

diff --git a/ChangeLog b/ChangeLog
index 9e993f7..6eea638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
-ags (0.4.2-78-1)
+ags (0.4.2.80)
+
+	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
+	* fixed renaming
+	* fixed audio channel bug in notation recall
+
+ags (0.4.2.79)
+
+	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
+	* renamed binary and project
+	* added missing copyright notice
+
+ags (0.4.2-78)
 
 	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
 	* implemented distinct between sequencer and notation loop
@@ -7,7 +19,7 @@ ags (0.4.2-78-1)
 	* refactored fix auto-scroll
 	* added exclude sequencer for export dialog
 
-ags (0.4.2-77-1)
+ags (0.4.2-77)
 
 	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
 	* fixed possible NULL pointer in ags_play_notation.c
@@ -15,7 +27,7 @@ ags (0.4.2-77-1)
 	* implemented AGS_AUDIO_REVERSE_MAPPING flag, it indicates channel mapping should be interpreted in reverse order
 	* implemented invert tool for notation editor
 
-ags (0.4.2-76-1)
+ags (0.4.2-76)
 
 	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
 	* fixed boundary for matrix clipboard
@@ -27,7 +39,7 @@ ags (0.4.2-76-1)
 	* fixed audio channel resize for mono machines, disabled it in machine properties dialog
 	* enhanced LADSPA browser refresh
 
-ags (0.4.2-75-1)
+ags (0.4.2-75)
 
 	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
 	* fixed deactivate led in AgsDrum and AgsMatrix
@@ -35,7 +47,7 @@ ags (0.4.2-75-1)
 	* fixed adjusting audio channels for tabs of editor
 	* implemented shift piano thereby fixed piano allocation
 
-ags (0.4.2-74-1)
+ags (0.4.2-74)
 
 	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
 	* fixed AgsPatternEdit focus, selection, coloring of selected notes and a crash related to wrong function call
@@ -44,20 +56,20 @@ ags (0.4.2-74-1)
 	* fixed AgsMatrix input
 	* fixed NULL pointer error in ags_count_beats_audio_run.c
 
-ags (0.4.2-73-1)
+ags (0.4.2-73)
 
 	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
 	* back-ported AgsPatternEdit
 	* implemented basic editing key strokes like Ctrl-c, Ctrl-v and Ctrl-x for AgsPatternEdit
 
-ags (0.4.2-72-1)
+ags (0.4.2-72)
 
 	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
 	* implemented basic editing key strokes like Ctrl-c, Ctrl-v and Ctrl-x
 	* implemented seeking for paste if position tool is selected
 	* updated clipboard version to 0.4.2
 
-ags (0.4.2-71-1)
+ags (0.4.2-71)
 
 	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
 	* commented-out two unimplemented menu entries in editor's machine selector. Add and remove tab you may do so by using resize tab of machine properties dialog.
@@ -66,17 +78,17 @@ ags (0.4.2-71-1)
 	* fixed refresh of GUI after cut or paste
 	* fixed crash related to XML IO
 
-ags (0.4.2-70-1)
+ags (0.4.2-70)
 
 	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
 	* minor bug-fixes
 
-ags (0.4.2-69-1)
+ags (0.4.2-69)
 
 	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
 	* added XSL file to transform output of `midi2xml` using `xsltproc`
 
-ags (0.4.2-68-1)
+ags (0.4.2-68)
 
 	[ Joël Krähemann (Maintainer of Advanced Gtk+ Sequencer) ]
 	* added `midi2xml` the MIDI file to XML parser
diff --git a/configure b/configure
index 86f62de..4ae27a4 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 gsequencer 0.4.2.79.
+# Generated by GNU Autoconf 2.69 for gsequencer 0.4.2.80.
 #
 # Report bugs to <jkraehemann-guest at users.alioth.debian.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gsequencer'
 PACKAGE_TARNAME='gsequencer'
-PACKAGE_VERSION='0.4.2.79'
-PACKAGE_STRING='gsequencer 0.4.2.79'
+PACKAGE_VERSION='0.4.2.80'
+PACKAGE_STRING='gsequencer 0.4.2.80'
 PACKAGE_BUGREPORT='jkraehemann-guest at users.alioth.debian.org'
 PACKAGE_URL=''
 
@@ -1317,7 +1317,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 gsequencer 0.4.2.79 to adapt to many kinds of systems.
+\`configure' configures gsequencer 0.4.2.80 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1387,7 +1387,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gsequencer 0.4.2.79:";;
+     short | recursive ) echo "Configuration of gsequencer 0.4.2.80:";;
    esac
   cat <<\_ACEOF
 
@@ -1523,7 +1523,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gsequencer configure 0.4.2.79
+gsequencer configure 0.4.2.80
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2000,7 +2000,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 gsequencer $as_me 0.4.2.79, which was
+It was created by gsequencer $as_me 0.4.2.80, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2866,7 +2866,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gsequencer'
- VERSION='0.4.2.79'
+ VERSION='0.4.2.80'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7161,7 +7161,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 gsequencer $as_me 0.4.2.79, which was
+This file was extended by gsequencer $as_me 0.4.2.80, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7227,7 +7227,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="\\
-gsequencer config.status 0.4.2.79
+gsequencer config.status 0.4.2.80
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 1f2c7e4..53b2e8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([gsequencer],[0.4.2.79],[jkraehemann-guest at users.alioth.debian.org])
+AC_INIT([gsequencer],[0.4.2.80],[jkraehemann-guest at users.alioth.debian.org])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
diff --git a/src/ags/X/ags_menu_bar_callbacks.c b/src/ags/X/ags_menu_bar_callbacks.c
index 8108a61..d75543b 100644
--- a/src/ags/X/ags_menu_bar_callbacks.c
+++ b/src/ags/X/ags_menu_bar_callbacks.c
@@ -100,7 +100,7 @@ ags_menu_bar_open_ok_callback(GtkWidget *widget, AgsMenuBar *menu_bar)
 
   error = NULL;
 
-  g_spawn_command_line_async(g_strdup_printf("./ags --filename %s\0",
+  g_spawn_command_line_async(g_strdup_printf("./gsequencer --filename %s\0",
 					     filename),
 			     &error);
 
@@ -173,7 +173,7 @@ ags_menu_bar_save_as_callback(GtkWidget *menu_item, AgsMenuBar *menu_bar)
 
     window->name = filename;
     gtk_window_set_title((GtkWindow *) window,
-			 g_strconcat("ags - \0",
+			 g_strconcat("GSequencer - \0",
 				     window->name,
 				     NULL));
     
@@ -488,7 +488,7 @@ ags_menu_bar_about_callback(GtkWidget *menu_item, AgsMenuBar *menu_bar)
   }
   
   gtk_show_about_dialog((GtkWindow *) gtk_widget_get_ancestor((GtkWidget *) menu_bar, GTK_TYPE_WINDOW),
-			"program-name\0", "ags\0",
+			"program-name\0", "gsequencer\0",
 			"authors\0", authors,
 			"license\0", license,
 			"version\0", AGS_VERSION,
diff --git a/src/ags/X/ags_window.c b/src/ags/X/ags_window.c
index 92bec7d..241a976 100644
--- a/src/ags/X/ags_window.c
+++ b/src/ags/X/ags_window.c
@@ -179,7 +179,7 @@ ags_window_init(AgsWindow *window)
 
   window->name = g_strdup("unnamed\0");
 
-  gtk_window_set_title((GtkWindow *) window, g_strconcat("ags - \0", window->name, NULL));
+  gtk_window_set_title((GtkWindow *) window, g_strconcat("GSequencer - \0", window->name, NULL));
 
   vbox = (GtkVBox *) gtk_vbox_new(FALSE, 0);
   gtk_container_add((GtkContainer *) window, (GtkWidget*) vbox);
diff --git a/src/ags/audio/recall/ags_play_notation_audio_run.c b/src/ags/audio/recall/ags_play_notation_audio_run.c
index 1e68f9c..a24fa10 100644
--- a/src/ags/audio/recall/ags_play_notation_audio_run.c
+++ b/src/ags/audio/recall/ags_play_notation_audio_run.c
@@ -678,11 +678,11 @@ ags_play_notation_audio_run_alloc_input_callback(AgsDelayAudioRun *delay_audio_r
 
   //FIXME:JK: nth_run isn't best joice
   if((AGS_AUDIO_NOTATION_DEFAULT & (audio->flags)) != 0){
-    audio_channel = nth_run;
+    audio_channel = AGS_CHANNEL(AGS_RECYCLING(AGS_RECALL(delay_audio_run)->recall_id->recycling)->channel)->audio_channel;
     channel = ags_channel_nth(audio->input,
 			      audio_channel);
   }else{
-    audio_channel = nth_run;
+    audio_channel = AGS_CHANNEL(AGS_RECYCLING(AGS_RECALL(delay_audio_run)->recall_id->recycling)->channel)->audio_channel;
     channel = ags_channel_nth(audio->output,
 			      audio_channel);
   }
diff --git a/src/midi2ags/main.c b/src/midi2ags/main.c
index 2f97aa9..e2692d8 100644
--- a/src/midi2ags/main.c
+++ b/src/midi2ags/main.c
@@ -1,3 +1,21 @@
+/* GSequencer - Advanced GTK Sequencer
+ * Copyright (C) 2005-2015 Joël Krähemann
+ *
+ * This file is part of GSequencer.
+ *
+ * GSequencer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GSequencer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GSequencer.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #include <glib.h>
 #include <glib-object.h>
 
diff --git a/src/midi2ags/midi/ags_midi_parser.c b/src/midi2ags/midi/ags_midi_parser.c
index e855704..46be235 100644
--- a/src/midi2ags/midi/ags_midi_parser.c
+++ b/src/midi2ags/midi/ags_midi_parser.c
@@ -1,19 +1,20 @@
-/* AGS - Advanced GTK Sequencer
- * Copyright (C) 2015 Joël Krähemann
+/* GSequencer - Advanced GTK Sequencer
+ * Copyright (C) 2005-2015 Joël Krähemann
  *
- * This program is free software; you can redistribute it and/or modify
+ * This file is part of GSequencer.
+ *
+ * GSequencer is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * GSequencer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with GSequencer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <midi2ags/midi/ags_midi_parser.h>
diff --git a/src/midi2ags/midi/ags_midi_parser.h b/src/midi2ags/midi/ags_midi_parser.h
index ed13452..de27b09 100644
--- a/src/midi2ags/midi/ags_midi_parser.h
+++ b/src/midi2ags/midi/ags_midi_parser.h
@@ -1,19 +1,20 @@
-/* AGS - Advanced GTK Sequencer
- * Copyright (C) 2015 Joël Krähemann
+/* GSequencer - Advanced GTK Sequencer
+ * Copyright (C) 2005-2015 Joël Krähemann
  *
- * This program is free software; you can redistribute it and/or modify
+ * This file is part of GSequencer.
+ *
+ * GSequencer is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * GSequencer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with GSequencer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __AGS_MIDI_PARSER_H__
diff --git a/src/midi2ags/object/ags_marshal.c b/src/midi2ags/object/ags_marshal.c
index ab8534a..8ac5d39 100644
--- a/src/midi2ags/object/ags_marshal.c
+++ b/src/midi2ags/object/ags_marshal.c
@@ -1,3 +1,21 @@
+/* GSequencer - Advanced GTK Sequencer
+ * Copyright (C) 2005-2015 Joël Krähemann
+ *
+ * This file is part of GSequencer.
+ *
+ * GSequencer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GSequencer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GSequencer.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include	<glib-object.h>
 
diff --git a/src/midi2ags/object/ags_marshal.h b/src/midi2ags/object/ags_marshal.h
index 0043dbc..319707e 100644
--- a/src/midi2ags/object/ags_marshal.h
+++ b/src/midi2ags/object/ags_marshal.h
@@ -1,3 +1,21 @@
+/* GSequencer - Advanced GTK Sequencer
+ * Copyright (C) 2005-2015 Joël Krähemann
+ *
+ * This file is part of GSequencer.
+ *
+ * GSequencer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GSequencer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GSequencer.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifndef __g_cclosure_user_marshal_MARSHAL_H__
 #define __g_cclosure_user_marshal_MARSHAL_H__

-- 
gsequencer packaging



More information about the pkg-multimedia-commits mailing list