gcc 4.0 fixes, 2005, terminatorX.org and more - Alex

diff --git a/ChangeLog b/ChangeLog
index 4c351d74e0ff543738fda89e2e48a99d5012e38c..e9ccd26c6c5ff546b93e0638e71b98d98eac6cce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
 
    terminatorX ChangeLog
 
-   Copyright (C) 1999-2004 Alexander König
+   Copyright (C) 1999-2005 Alexander König
+
+   Version 3.83
+     * moved to terminatorX.org
+     * fixed misc gcc 4.0 warnings.
+     * removed fastabs() implementation - it failed with gcc > 4.0.
+     * fixed a compilation issue TODO: who sent a patch?.
 
    Version 3.82
      * the position of the audio control scrollbars is now saved within

diff --git a/INSTALL b/INSTALL
index ae947061792a3562bb29d9e5deaa9809d56f3b8a..fff165d0bab418f1e6cc32cf02f51d6212f26c34 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
 terminatorX INSTALL:
-Copyright (C) 1999-2004 by Alexander König <alex@lisas.de>
-http://terminatorX.cx
+Copyright (C) 1999-2005 by Alexander König <alex@lisas.de>
+http://terminatorX.org
 
 Note: As of Version 3.70 you need to have LADSPA installed to compile
 terminatorX. To get LADSPA visit http: http://www.ladspa.org

diff --git a/README b/README
index 731c2637b0edd50794a5efec2d6754fdcca9b36d..b1018499dfb09991f015d9e307a2069aad8e09b5 100644 (file)
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
 terminatorX V3.82 README
 ------------------------
 
-Copyright (C) 1999-2004 Alexander König
+Copyright (C) 1999-2005 Alexander König
 eMail: alex@lisas.de
-Homepage: http://terminatorX.cx
+Homepage: http://terminatorX.org
 
 This is free software see the COPYING file that came with this
 distribution for details.

diff --git a/configure.in b/configure.in
index a65a0df0a1f99f15087208d0875596b6522a5c66..8fe66d1ca437661ff38de7e26aecbb5824e654d0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/tX_global.h)
-AM_INIT_AUTOMAKE(terminatorX, 3.82)
+AM_INIT_AUTOMAKE(terminatorX, 3.83)
 AM_CONFIG_HEADER(config.h)
 
 AC_ARG_ENABLE(sox,             [  --enable-sox            use sox as input converter. (default=auto) ])
@@ -626,8 +626,6 @@ echo configured terminatorX for:
 echo ---------------------------
 echo
 
-echo manual: $xml_man
-
 option=sox; option_val=$OPTION_SOX; option_url=http://sox.sourceforge.net/
 option_info;
 

diff --git a/doc/terminatorX-manual/C/terminatorX-manual.xml b/doc/terminatorX-manual/C/terminatorX-manual.xml
index 8548761b9d11b4a9ee592b4ce78830a4e4f84cde..0d575c85eda7ee3836eb641b927aeebbe731825c 100644 (file)
--- a/doc/terminatorX-manual/C/terminatorX-manual.xml
+++ b/doc/terminatorX-manual/C/terminatorX-manual.xml
@@ -101,9 +101,9 @@
       an easy-to-use gtk+ GUI.</para>
 
       <para>This is software may have 
-      <ulink url="http://terminatorX.cx/bugs.html">bugs</ulink> please 
+      <ulink url="http://terminatorX.org/bugs.html">bugs</ulink> please 
       help fixing them. See <xref linkend="CONTACT"/>. Please read this 
-      manual and visit the <ulink url="http://www.terminatorX.cx">
+      manual and visit the <ulink url="http://www.terminatorX.org">
       homepage</ulink>.</para>
 
     </sect2>
@@ -824,11 +824,11 @@
 
           <listitem>
 
-            <para><emphasis>Visit terminatorX.cx</emphasis></para>
+            <para><emphasis>Visit terminatorX.org</emphasis></para>
 
             <para>Will try to spawn a browser process to load the URL 
-            <ulink url="http://terminatorX.cx">
-            http://terminatorX.cx</ulink> - for easy update checking or 
+            <ulink url="http://terminatorX.org">
+            http://terminatorX.org</ulink> - for easy update checking or 
             just unecessary bloat.</para>
 
           </listitem>
@@ -2074,7 +2074,7 @@
       <para>If you want to use your joystick to control terminatorX - I 
       wrote a tiny tool to create MIDI events from joystick motion 
       called <emphasis>aseqjoy</emphasis>. It's available from the 
-      <ulink url="http://terminatorX.cx/aseqjoy.html">terminatorX 
+      <ulink url="http://terminatorX.org/aseqjoy.html">terminatorX 
       website</ulink>, too.</para>
 
     </sect2>
@@ -2269,7 +2269,7 @@
     <title>Contact / Download</title>
 
     <para>Find out more about terminatorX at it's 
-    <ulink url="http://www.terminatorX.cx">homepage</ulink>.</para>
+    <ulink url="http://www.terminatorX.org">homepage</ulink>.</para>
 
     <para>Send me comments, bug-reports, patches or scratches (see 
     scratches section on the terminatorX homepage) at: 

diff --git a/src/icons/icons.pixbuf b/src/icons/icons.pixbuf
index 4b54cb78409363a550857d8de779f27d8486ecad..c49caeba377a52cf6433d595a78733b31393e70e 100644 (file)
--- a/src/icons/icons.pixbuf
+++ b/src/icons/icons.pixbuf
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/icons/knobs.pixbuf b/src/icons/knobs.pixbuf
index a2c6da6e95705e7ad58d4169b4bea08cae7b3524..d18d306f02bd96ff93707db3033f8338ff7cc4f7 100644 (file)
--- a/src/icons/knobs.pixbuf
+++ b/src/icons/knobs.pixbuf
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/main.cc b/src/main.cc
index f76367572f73a6c71273d003e11734646317c38a..f2c4c23ad5352621b15522d8aec6c86fbbb548e1 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -187,7 +187,7 @@ void checkenv(const char *name)
 
 int main(int argc, char **argv)
 {
-       fprintf(stderr, "%s - Copyright (C) 1999-2004 by Alexander König\n", VERSIONSTRING);
+       fprintf(stderr, "%s - Copyright (C) 1999-2005 by Alexander König\n", VERSIONSTRING);
        fprintf(stderr, "terminatorX comes with ABSOLUTELY NO WARRANTY - for details read the license.\n");
 
 #ifdef USE_CAPABILITIES        

diff --git a/src/tX_audiodevice.cc b/src/tX_audiodevice.cc
index 971a08bc0467a56bffb62bc31b6d4b8765df1c72..98d4b23fd5261faa81d848f9a1af020b7b6ce269 100644 (file)
--- a/src/tX_audiodevice.cc
+++ b/src/tX_audiodevice.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_audiodevice.h b/src/tX_audiodevice.h
index 56c4635db822d46cf618724ef44ad1acaeae39ae..9f82fdef27c37e07cd50f1ef63be34340facd6ce 100644 (file)
--- a/src/tX_audiodevice.h
+++ b/src/tX_audiodevice.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander K�nig
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -69,6 +69,7 @@ class tX_audiodevice
        bool get_is_open() { return is_open; }
        virtual void start();   
        virtual void play(int16_t*)=0; /* play blocked */
+       virtual ~tX_audiodevice() {}
 };
 
 

diff --git a/src/tX_audiofile.cc b/src/tX_audiofile.cc
index 68bbb67195619483b7d2a8c3f70cfb29bec790a5..c1c47a4ce64c335f7ab3e771170d0e0d9ffc8686 100644 (file)
--- a/src/tX_audiofile.cc
+++ b/src/tX_audiofile.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_audiofile.h b/src/tX_audiofile.h
index d908dc4af848a14723cd64d5e135daae2a472ab1..670dbe5f2a12967de4bb06c0d355c994d8705042 100644 (file)
--- a/src/tX_audiofile.h
+++ b/src/tX_audiofile.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_capabilities.cc b/src/tX_capabilities.cc
index caed0d0bf0bbb0ba4569b3231d26cb108557f20f..fa4fbb420560e233ff3f0c5fe1f7a9c1b7f45c1e 100644 (file)
--- a/src/tX_capabilities.cc
+++ b/src/tX_capabilities.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_capabilities.h b/src/tX_capabilities.h
index 5debd9cc15b203bf9baabda113c5cc85e6b9747f..fe68562993ff4a5cef0743482f520ca3c8794b9f 100644 (file)
--- a/src/tX_capabilities.h
+++ b/src/tX_capabilities.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_dial.c b/src/tX_dial.c
index b60e13bd6046ca6c99bb94987ad2e2a060d3e2ea..e77f08b18b17239f65fbb1b8ecd6833da1364e9d 100644 (file)
--- a/src/tX_dial.c
+++ b/src/tX_dial.c
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_dial.h b/src/tX_dial.h
index b919443d4c06688dc2f4d9aac01a73cf5aed8221..c11174dd0e60957dc3ec4110afffc247b825add9 100644 (file)
--- a/src/tX_dial.h
+++ b/src/tX_dial.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_dialog.cc b/src/tX_dialog.cc
index 8b1c09c5c09ffbc167d415dc519e09770ad1b8c7..cb34810caa942e86b836bbb9844d488d8e256322 100644 (file)
--- a/src/tX_dialog.cc
+++ b/src/tX_dialog.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -451,7 +451,7 @@ void init_tx_options(GtkWidget *dialog) {
        gtk_range_set_value(GTK_RANGE(lookup_widget(dialog, "update_delay")), globals.update_delay);
        gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "update_delay"), "How often to update the slow widgets.", NULL);   
        gtk_range_set_value(GTK_RANGE(lookup_widget(dialog, "update_idle")), globals.update_idle);
-       gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "update_idle"), "The update thread will idle for the selcted amount of milliseconds. If you want to have a more responsive display update increase this value - if you have performance problems reduce this value.", NULL);       
+       gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "update_idle"), "The update thread will idle for the selcted amount of milliseconds. If you want to have a more responsive display update reduce this value - if you have performance problems increase this value.", NULL);       
        gtk_range_set_value(GTK_RANGE(lookup_widget(dialog, "vumeter_decay")), globals.flash_response);
        gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "vumeter_decay"), "Defines how fast the maximum values of the VU meters should be decayed.", NULL);        
 
@@ -567,7 +567,7 @@ void show_about(int nag)
                gtk_misc_set_alignment(GTK_MISC(label), 0.1, 0.5);
                gtk_widget_show(label);
 
-               label=gtk_label_new("Copyright (C) 1999-2004 by Alexander K\xC3\xB6nig");
+               label=gtk_label_new("Copyright (C) 1999-2005 by Alexander K\xC3\xB6nig");
                gtk_box_pack_start(GTK_BOX(box2), label, WID_DYN);
                gtk_misc_set_alignment(GTK_MISC(label), 0.9, 0.5);
                gtk_widget_show(label);
@@ -585,8 +585,8 @@ void show_about(int nag)
                sep=gtk_hseparator_new();
                add_about_wid_fix(sep);
                
-               label=gtk_label_new("This is "PACKAGE" release "VERSION" - Copyright (C) 1999-2004 by Alexander K\xC3\xB6nig"
-               "\nSend comments, patches and scratches to: alex@lisas.de\nterminatorX-homepage: http://www.terminatorX.cx");
+               label=gtk_label_new("This is "PACKAGE" release "VERSION" - Copyright (C) 1999-2005 by Alexander K\xC3\xB6nig"
+               "\nSend comments, patches and scratches to: alex@lisas.de\nterminatorX-homepage: http://www.terminatorX.org");
 
                gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
                add_about_wid_fix(label);

diff --git a/src/tX_dialog.h b/src/tX_dialog.h
index 32547dc0305d2e0d18e51677d6eba9ac441ef8ef..54fa3f06e06cc3aeaf7d4dc018c1cdc25334ea6a 100644 (file)
--- a/src/tX_dialog.h
+++ b/src/tX_dialog.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_endian.c b/src/tX_endian.c
index aefe73306404c2a6d4d2226e86c7f72f147d3404..8b9097485466205eccbd0867ecf96d6951be144a 100644 (file)
--- a/src/tX_endian.c
+++ b/src/tX_endian.c
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_endian.h b/src/tX_endian.h
index 23ba5b06b99cf5e2ad236d33ef1a3aee4884d5fa..81e0c18b24ac54e6ef47fb67bb8a82b6fc1cebb2 100644 (file)
--- a/src/tX_endian.h
+++ b/src/tX_endian.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_engine.cc b/src/tX_engine.cc
index b178c5c90f3a9bdac84507c93504c387538075b2..b88fc1841bce036d9f704af5c89e729d301db627 100644 (file)
--- a/src/tX_engine.cc
+++ b/src/tX_engine.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_engine.h b/src/tX_engine.h
index 005f4023d7198b69380c39a7acaaf915788d1151..b403679d350f25175250f3de77050e8c9c7b7b0f 100644 (file)
--- a/src/tX_engine.h
+++ b/src/tX_engine.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_event.cc b/src/tX_event.cc
index cfa14263fc6adb417a1da5acf8ebb3cbfc071381..70f64c9648dab7f205b7c544322fac1c3a287860 100644 (file)
--- a/src/tX_event.cc
+++ b/src/tX_event.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_event.h b/src/tX_event.h
index 63875fd59636eff067c4ae60da61299405f35a86..d33b7a14e3ba3bf41b4e774b9d01758d6f8121c0 100644 (file)
--- a/src/tX_event.h
+++ b/src/tX_event.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_extdial.cc b/src/tX_extdial.cc
index 06b302a83e6565900cc0f8610e2b23519d2f7f33..3af73eb130f81f1d30e9901b641ef92d5c1ebbb4 100644 (file)
--- a/src/tX_extdial.cc
+++ b/src/tX_extdial.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_flash.c b/src/tX_flash.c
index fe6fa584d7957c909865149b7250f516172a38a5..62e5d27f050c686a88b0518bfb2ff7e094011449 100644 (file)
--- a/src/tX_flash.c
+++ b/src/tX_flash.c
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander K�nig
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -163,8 +163,9 @@ static void gtk_tx_flash_init (GtkTxFlash *tx_flash)
 GtkWidget* gtk_tx_flash_new ()
 {
        GtkTxFlash *tx_flash;
-       
        tx_flash = (GtkTxFlash *)g_object_new(gtk_tx_flash_get_type (), NULL);  
+       
+       // tX_msg("creating a new flash: %08x\n", tx_flash);
        return GTK_WIDGET (tx_flash);
 }
 
@@ -358,6 +359,8 @@ static void gtk_tx_flash_set_channel_level(GtkTxFlash *tx_flash, f_prec new_valu
        
        new_level=(int) (new_value/tx_flash->level_value);
        
+       // tX_msg("setting level: %5d for widget %08x channel %08x\n", new_level, tx_flash, channel);
+       
        if (new_level>tx_flash->levels) 
                new_level=tx_flash->levels;
        

diff --git a/src/tX_flash.h b/src/tX_flash.h
index 69553d389a46a0a5bffed1a4d027c263f243172c..b8aea3c1fc81e1d7805cbd1bfb8029982040d49f 100644 (file)
--- a/src/tX_flash.h
+++ b/src/tX_flash.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_glade_callbacks.cc b/src/tX_glade_callbacks.cc
index 0cc15a47bc026fc2f85dece66472f730363d7760..96568ccb2bb77fdef0f1fa9632e49ac66391dc17 100644 (file)
--- a/src/tX_glade_callbacks.cc
+++ b/src/tX_glade_callbacks.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_global.c b/src/tX_global.c
index 18280324ea7c6607bf78b16fbb8a7f7bd7172816..a16075ce025411430ee03f5a9d823da39e12444e 100644 (file)
--- a/src/tX_global.c
+++ b/src/tX_global.c
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_global.h b/src/tX_global.h
index 416b43d224a692b7981585714710480c72656153..41be4538fafc7e1c29a079e6f032f5db90e31141 100644 (file)
--- a/src/tX_global.h
+++ b/src/tX_global.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_icon.c b/src/tX_icon.c
index 40eea496c3dcfcda5e80f5768108d72e34e40ef4..8a2c38173747695932d6eb2b0aed27e142337ac6 100644 (file)
--- a/src/tX_icon.c
+++ b/src/tX_icon.c
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_icon.h b/src/tX_icon.h
index fdc6bb41ad63499544bf902d50e0e3cb5a458fa5..4020c59c74a2e725162534ccff688c08f3d9d8f2 100644 (file)
--- a/src/tX_icon.h
+++ b/src/tX_icon.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_knobloader.c b/src/tX_knobloader.c
index 85944b181a7ce83639fec1b4721a97287693edd7..160cb6a27834b8ff164a19db443f775844387f56 100644 (file)
--- a/src/tX_knobloader.c
+++ b/src/tX_knobloader.c
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_knobloader.h b/src/tX_knobloader.h
index 303cebc1d51ddba870614d2b8ec0e1f954eb5596..2fdf54c7a7aadc1aff643e60f87fc68d9e4ec636 100644 (file)
--- a/src/tX_knobloader.h
+++ b/src/tX_knobloader.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_ladspa.cc b/src/tX_ladspa.cc
index 9bef933cbf0a7b52d1376aec7044444dbd60e11d..e28b028722cce3231cf88d9c970f0a23c12fcf43 100644 (file)
--- a/src/tX_ladspa.cc
+++ b/src/tX_ladspa.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_ladspa.h b/src/tX_ladspa.h
index ad34f6279306d62fedaa048116992b256234d14f..e341f4be8dc8bd7cdcf908663887429dfbf9a80f 100644 (file)
--- a/src/tX_ladspa.h
+++ b/src/tX_ladspa.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander K�nig
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -60,6 +60,7 @@ class LADSPA_Plugin
        static LADSPA_Plugin * getPluginByIndex(int i);
        static LADSPA_Plugin * getPluginByUniqueID(long ID);
        const LADSPA_Descriptor *getDescriptor() { return ladspa_descriptor; }
+       virtual ~LADSPA_Plugin() {};
 };
 
 class LADSPA_Stereo_Plugin : public LADSPA_Plugin

diff --git a/src/tX_ladspa_class.cc b/src/tX_ladspa_class.cc
index bf5dbfd33d24ee4803d40072e806644e9137e8a6..5538bbd2a37e4c6bc8a4c5525e3468478e0121eb 100644 (file)
--- a/src/tX_ladspa_class.cc
+++ b/src/tX_ladspa_class.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander K�nig
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -168,7 +168,7 @@ LADSPA_Class :: LADSPA_Class (char *uri) : label(NULL), accept_all(false) {
 #ifdef USE_LRDF        
        lrdf_uris *ulist;
        char *urilabel;
-       int i;
+       unsigned int i;
 
        if (!liblrdf_error) {
                urilabel=lrdf_get_label(uri);

diff --git a/src/tX_ladspa_class.h b/src/tX_ladspa_class.h
index c406a045506599cc2f7df81a0fa2c405cc8b4e34..67bb795cc0f91a2253702981318624e888744150 100644 (file)
--- a/src/tX_ladspa_class.h
+++ b/src/tX_ladspa_class.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_legacy_global.c b/src/tX_legacy_global.c
index d42247890193e91afcc30357a9e6b36a666df585..9ad43f9bffd43561d6f5f5316dd6c9f3b7aa8fb0 100644 (file)
--- a/src/tX_legacy_global.c
+++ b/src/tX_legacy_global.c
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_legacy_vtt.cc b/src/tX_legacy_vtt.cc
index 89992928c179df67960b903e7c17ad4fca4ec218..aa81d94b0bbfc35b80b8aca9dcb8e1c6754e2d7b 100644 (file)
--- a/src/tX_legacy_vtt.cc
+++ b/src/tX_legacy_vtt.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_loaddlg.cc b/src/tX_loaddlg.cc
index 01ff2512c6835529c188bcaddeb35fd486ce85d2..bddc3a6695fc7195ae72a4c06ee8eab61f8c3a28 100644 (file)
--- a/src/tX_loaddlg.cc
+++ b/src/tX_loaddlg.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_loaddlg.h b/src/tX_loaddlg.h
index fd6b71e6f3eb52d89e6cfd18f1a74d2716a48c40..4aacd8da8120c512c23b13eec70514bc966b21ad 100644 (file)
--- a/src/tX_loaddlg.h
+++ b/src/tX_loaddlg.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_logo.c b/src/tX_logo.c
index 5a10a9b57f06ac32cc37fb694a0913ac487aa702..6b429c172a7e8bb6ee393f362db72ba5f0e56f3f 100644 (file)
--- a/src/tX_logo.c
+++ b/src/tX_logo.c
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_mastergui.cc b/src/tX_mastergui.cc
index d8364e6f6d7c831f071e50c6f6bd604c2e581c03..0b6fb9d064b787c3a17213f333fed2adb4c16d3f 100644 (file)
--- a/src/tX_mastergui.cc
+++ b/src/tX_mastergui.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander K�nig
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -1395,7 +1395,7 @@ void create_master_menu()
        gtk_container_add (GTK_CONTAINER (sub_menu), menu_item);
        gtk_widget_set_sensitive (menu_item, FALSE);
 
-       menu_item = gtk_menu_item_new_with_mnemonic ("_Visit terminatorX.cx");
+       menu_item = gtk_menu_item_new_with_mnemonic ("_Visit terminatorX.org");
        gtk_widget_show (menu_item);
        gtk_container_add (GTK_CONTAINER (sub_menu), menu_item);
        g_signal_connect(menu_item, "activate", (GCallback) display_browser, NULL);
@@ -1690,7 +1690,7 @@ void note_destroy(GtkWidget *widget, GtkWidget *mbox)
 
 void tx_note(const char *message, bool isError, GtkWindow *window)
 {
-       if (!window) window==GTK_WINDOW(main_window);
+       if (!window) window=GTK_WINDOW(main_window);
        
        GtkWidget *dialog=gtk_message_dialog_new(window,
                GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1867,7 +1867,7 @@ int browser_checker()
                }
        } else {
                /* We are still here and the child exited - that could mean trouble. */
-               tx_note("Failed to run a suitable web browser - if there's one installed on this system, please run it and forward yourself to:\nhttp://terminatorX.cx", true);         
+               tx_note("Failed to run a suitable web browser - if there's one installed on this system, please run it and forward yourself to:\nhttp://terminatorX.org", true);                
                
                gtk_idle_remove(browser_tag);
                browser_tag=-1;
@@ -1889,10 +1889,10 @@ void display_browser()
        
        if (browser_child==0) {
                // child
-               execlp("mozilla","mozilla","http://terminatorX.cx", NULL);
-               execlp("netscape","netscape","http://terminatorX.cx", NULL);
-               execlp("galeon","galeon","http://terminatorX.cx", NULL);
-               execlp("konqueror","konqueror","http://terminatorX.cx", NULL);          
+               execlp("mozilla","mozilla","http://terminatorX.org", NULL);
+               execlp("netscape","netscape","http://terminatorX.org", NULL);
+               execlp("galeon","galeon","http://terminatorX.org", NULL);
+               execlp("konqueror","konqueror","http://terminatorX.org", NULL);         
                _exit(-1);
        } else if (browser_child==-1) {
                tx_note("System error: couldn't fork() to run the browser process.", true);

diff --git a/src/tX_mastergui.h b/src/tX_mastergui.h
index fafde356dce8e1c97fb3850fa579a529d466ebbf..2ab8a98bffa506f52c0d6c5fa12456aaf465c4d5 100644 (file)
--- a/src/tX_mastergui.h
+++ b/src/tX_mastergui.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_mouse.cc b/src/tX_mouse.cc
index 1106c1347fd41051bd3467a2ee7dcc60b4216d96..85954f049d01ef323f521f0fc604e84b24f58c25 100644 (file)
--- a/src/tX_mouse.cc
+++ b/src/tX_mouse.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_mouse.h b/src/tX_mouse.h
index 6dcd2fa7198b1b07bf9081d5fa524b315a8ce103..0ab813051d4468c5bb2edd8773acdaaeee8755e4 100644 (file)
--- a/src/tX_mouse.h
+++ b/src/tX_mouse.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_panel.cc b/src/tX_panel.cc
index 85ff7bce45e3296a0415cba9c09f38233ee36658..ad2695df1d06724f94b0d35f0e3cc676a3d0a803 100644 (file)
--- a/src/tX_panel.cc
+++ b/src/tX_panel.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_panel.h b/src/tX_panel.h
index f1e4a545a7a88eaee0e4acd4baa6f46695fab731..31a5e5c3a4793e6edf99e91fc458085b8eaf3d05 100644 (file)
--- a/src/tX_panel.h
+++ b/src/tX_panel.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_pbutton.cc b/src/tX_pbutton.cc
index 32622eae8a6b7fc1ff632ff219bfc9f237dc075b..c7ec672d81cf3e416a70e38459db784ded95457a 100644 (file)
--- a/src/tX_pbutton.cc
+++ b/src/tX_pbutton.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_pbutton.h b/src/tX_pbutton.h
index ee5bf473b5fb323d9be3b7d7d3655955afa8714a..380fa0094d2a01efe906b14c8dea0349ac5399d8 100644 (file)
--- a/src/tX_pbutton.h
+++ b/src/tX_pbutton.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_prelis.cc b/src/tX_prelis.cc
index d494012cf925e90f6b4fd434b306d94f8b690f01..757b8700fc41a85eb92b52cfc55a1a1e90f67256 100644 (file)
--- a/src/tX_prelis.cc
+++ b/src/tX_prelis.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander K�nig
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -88,7 +88,7 @@ void prelis_start(char *name) {
                        usempg123=1;
                        else
 #endif
-#ifdef USE_SOX_INPUT                   
+#if defined(USE_SOX_INPUT) && defined(USE_MPG123_INPUT)
                        usempg123=0;
 #else
                        return;

diff --git a/src/tX_prelis.h b/src/tX_prelis.h
index de4783382ff0846c1ee63528bc29f03ac19d9483..fc539f17ee8cb16269475fbf4161c5b7ac9750f0 100644 (file)
--- a/src/tX_prelis.h
+++ b/src/tX_prelis.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_sequencer.cc b/src/tX_sequencer.cc
index c7c697a6a2e2ff129c811015452ac6cc939441fa..e6395e750377b1f7ebe45f33ae883e21fd141977 100644 (file)
--- a/src/tX_sequencer.cc
+++ b/src/tX_sequencer.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_sequencer.h b/src/tX_sequencer.h
index ecc0b2b4bf7fc98d6f149e5316648572c8ed9fe8..8b3ae07112490c9f6b67cf0a476dc8c47fcb6d8c 100644 (file)
--- a/src/tX_sequencer.h
+++ b/src/tX_sequencer.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_tape.cc b/src/tX_tape.cc
index 8b73cef9a1d93279c74325bd9dec9c1e03941fe5..d30e8104244f9f867c15e798f54695599a5876fc 100644 (file)
--- a/src/tX_tape.cc
+++ b/src/tX_tape.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_tape.h b/src/tX_tape.h
index 8b43f3b38c6d616cf2646b43ee1419274426f328..7405b8d5b5be1f61ae97faca9393a03939c4edbc 100644 (file)
--- a/src/tX_tape.h
+++ b/src/tX_tape.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_types.h b/src/tX_types.h
index 004ce672251dc4a023b17d8791920f55f53564b1..28ede4f4601ac22699bf765b642ade5bd4aab7a4 100644 (file)
--- a/src/tX_types.h
+++ b/src/tX_types.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_vtt.cc b/src/tX_vtt.cc
index c22a932cb6136acdc875c9656b387d6d14f78047..65d2f85729d76ff7e058d4f72b95ad2099408910 100644 (file)
--- a/src/tX_vtt.cc
+++ b/src/tX_vtt.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander K�nig
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -498,20 +498,6 @@ void vtt_class :: ec_clear_buffer()
        ec_ptr=ec_buffer; 
 }
 
-#ifdef BIG_ENDIAN_MACHINE
-#define fastabs(x) fabs(x)
-#else
-// found this on musicdsp.org
-// posted by <tobybear@web.de>
-// proabably wont work on bigendian so we
-// use fabs() instead.
-inline float fastabs(float f)
-{
-       int i=((*(int*)&f)&0x7fffffff);
-       return (*(float*)&i);
-}
-#endif
-
 void vtt_class :: render()
 {
        list <vtt_fx *> :: iterator effect;
@@ -560,8 +546,8 @@ void vtt_class :: render()
        
        // find max signal for vu meters...
        for (int sample=0; sample<samples_in_outputbuffer; sample++) {
-               f_prec lmax=fastabs(output_buffer[sample]);
-               f_prec rmax=fastabs(output_buffer2[sample]);
+               f_prec lmax=fabs(output_buffer[sample]);
+               f_prec rmax=fabs(output_buffer2[sample]);
                
                if (lmax>max_value) max_value=lmax;
                if (rmax>max_value2) max_value2=rmax;
@@ -923,7 +909,7 @@ int16_t * vtt_class :: render_all_turntables()
 #endif                                 
                        mix_out_buffer[sample]=(int16_t) temp;
                        
-                       temp=fastabs(temp);
+                       temp=fabs(temp);
                        if (right) {
                                if (temp>mix_max_r) mix_max_r=temp;
                        } else {

diff --git a/src/tX_vtt.h b/src/tX_vtt.h
index 4e3957fce10d5ca94a4cb7d08c2bf8d77c36f90d..76b9fb52d2e147389cbffc890523658694002b26 100644 (file)
--- a/src/tX_vtt.h
+++ b/src/tX_vtt.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_vttfx.cc b/src/tX_vttfx.cc
index ccc8782cd07a802f5799aa876ea042bf039da82f..d86167f056e6abc581834e351451bd599c9ff14f 100644 (file)
--- a/src/tX_vttfx.cc
+++ b/src/tX_vttfx.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_vttfx.h b/src/tX_vttfx.h
index 9136bd53cb01e57005a78d8093177af78a38bbfd..44a8aa81fe529db4222553aadd54ac3b69d64661 100644 (file)
--- a/src/tX_vttfx.h
+++ b/src/tX_vttfx.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_vttgui.cc b/src/tX_vttgui.cc
index 165ec3da71d21f2618f9a79a74e1e8408884c306..e5d05fc62130b27750dff30290dba32ab81e47fa 100644 (file)
--- a/src/tX_vttgui.cc
+++ b/src/tX_vttgui.cc
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander K�nig
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -1461,10 +1461,16 @@ void update_all_vtts()
                if ((*vtt)->is_playing) {
                        gtk_tx_update_pos_display(GTK_TX((*vtt)->gui.display), (*vtt)->pos_i, (*vtt)->mute);
                        temp=(*vtt)->max_value*(*vtt)->res_volume*vtt_class::vol_channel_adjust;
-                       (*vtt)->max_value=0;
                        temp2=(*vtt)->max_value2*(*vtt)->res_volume*vtt_class::vol_channel_adjust;
-                       (*vtt)->max_value2=0;
+//                     tX_msg("Setting value: %f, %f -> %f; %f, %f -> %f (%f)\n",
+//                             (*vtt)->max_value, (*vtt)->res_volume, temp,
+//                             (*vtt)->max_value2, (*vtt)->res_volume, temp2,
+//                             vtt_class::vol_channel_adjust
+//                     );
                        gtk_tx_flash_set_level((*vtt)->gui.flash, temp, temp2);
+                       
+                       (*vtt)->max_value=0;
+                       (*vtt)->max_value2=0;
                }
                
                if ((*vtt)->needs_cleaning_up()) {

diff --git a/src/tX_vttgui.h b/src/tX_vttgui.h
index 2b6117ba30ea1891f777244b26cf8bf8499bca0f..06d3018c6d2434e9d9667ae79507af84f961af37 100644 (file)
--- a/src/tX_vttgui.h
+++ b/src/tX_vttgui.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_widget.c b/src/tX_widget.c
index 96eedff03db81af30ff0280b11578c64b0be74cd..60360f3e262188e56888b3d0fc021af58061507e 100644 (file)
--- a/src/tX_widget.c
+++ b/src/tX_widget.c
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/tX_widget.h b/src/tX_widget.h
index 2585e5654ff38e59e0bf7ffb4ef12ad5736a9f99..7f9bb9cf40fca9afda2c9b49f14577a2de099fd6 100644 (file)
--- a/src/tX_widget.h
+++ b/src/tX_widget.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/version.h b/src/version.h
index 94cba1bb3551a29b1568818ee2f856a416a6357f..a1f02f64801bd446a804f573a060dc1f723e3269 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,6 +1,6 @@
 /*
     terminatorX - realtime audio scratching software
-    Copyright (C) 1999-2004  Alexander König
+    Copyright (C) 1999-2005  Alexander König
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/terminatorX.spec.in b/terminatorX.spec.in
index 2727b8375f5ea87aafa33aabcd65f4ad028c5b7d..ad4d4cac57393cd7a1c1d81c88cc802ac43c36d9 100644 (file)
--- a/terminatorX.spec.in
+++ b/terminatorX.spec.in
@@ -8,7 +8,7 @@ Version: %{version}
 Release: %{release}
 Group: Applications/Multimedia
 Copyright: GPL2
-URL: http://www.terminatorX.cx
+URL: http://www.terminatorX.org
 Source: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: gtk2, libvorbis, audiofile, libxml2, zlib, scrollkeeper, yelp, sox, vorbis-tools, libcap