New icons - can't remember the rest - Alex

diff --git a/gnome-support/terminatorX-app.png b/gnome-support/terminatorX-app.png
index e29b41cd28518a579c5548484e03827b0233ba72..00f97948baf2ca7cfb2d4e5e7fa94fa545ef8543 100644 (file)
Binary files a/gnome-support/terminatorX-app.png and b/gnome-support/terminatorX-app.png differ

diff --git a/gnome-support/terminatorX-mime.png b/gnome-support/terminatorX-mime.png
index 7475a52384ac0df85e21e6a8673820ea38fe95bf..57b4e8cd68ffd2598127ac9b58d4e522da263306 100644 (file)
Binary files a/gnome-support/terminatorX-mime.png and b/gnome-support/terminatorX-mime.png differ

diff --git a/src/tX_audiofile.cc b/src/tX_audiofile.cc
index 7a4072c22b5c6e9ef0773ca75c9f0fc2f3d612e6..98f11d23ed4a8b317e7037b066ab19ba8ef3e55a 100644 (file)
--- a/src/tX_audiofile.cc
+++ b/src/tX_audiofile.cc
@@ -153,7 +153,7 @@ tX_audio_error tx_audiofile :: load(char *p_file_name)
 #endif 
 
        if (!load_err) {
-               printf("samplerate is :%i\n", sample_rate);
+               tX_debug("tx_audiofile::load() Set samplerate to %i for file %s.", sample_rate, filename);
        }
        return(load_err);
 }
@@ -294,11 +294,6 @@ tX_audio_error tx_audiofile :: load_wav() {
                return(TX_AUDIO_ERR_WAV_NOTFOUND);
        }
 
-#ifdef USE_CONSOLE
-       printf("Loading: %s\n", filename);
-       if (parms.verbose) printf("File: %i Bytes Data, %i Bit Depth, %i Hz Samplerate.\n", wav_in.len, wav_in.depth, wav_in.srate);    
-#endif 
-
        if (wav_in.depth != 16)
        {
                return(TX_AUDIO_ERR_NOT_16BIT);
@@ -311,17 +306,6 @@ tX_audio_error tx_audiofile :: load_wav() {
 
        sample_rate=wav_in.srate;
        
-#ifdef USE_CONSOLE     
-       if (wav_in.srate != 44100) 
-       {
-               puts("[load_wav] Warning: Wave-File was not recorded at 44.100 Hz!");
-       }
-       if (wav_in.blkalign != 2)
-       {
-               printf("[load_wav] Warning: Unexpected block alignment: %i.\n", wav_in.blkalign);
-       }
-#endif
-
        memsize=wav_in.len;
        data = (int16_t *) malloc (memsize);
                

diff --git a/src/tX_dialog.cc b/src/tX_dialog.cc
index ce7f7440afa9dc3702a48f84207f75df27f3856e..57266ad7e955cb36c5eca15d6f8b4e37d33cdf6e 100644 (file)
--- a/src/tX_dialog.cc
+++ b/src/tX_dialog.cc
@@ -574,9 +574,43 @@ void show_about(int nag)
        
        gtk_widget_show( pwid );
 
-       if (nag)
-       {
-               gtk_container_add(GTK_CONTAINER(window), pwid);
+       if (nag) {
+               GtkWidget *box=gtk_vbox_new(FALSE, 2);
+               GtkWidget *box2=gtk_hbox_new(FALSE, 2);
+               GtkWidget *seph=gtk_hseparator_new();
+               GtkWidget *label;
+#ifndef USE_GTK2               
+               char about_prefix_umlaut[]="Copyright (C) 1999-2002 by Alexander König";
+               char about_prefix_broken_umlaut[]="Copyright (C) 1999-2002 by Alexander Ko\"nig";
+               char *str;
+#endif         
+               
+               gtk_container_add(GTK_CONTAINER(window), box);
+               gtk_box_pack_start(GTK_BOX(box), pwid, WID_FIX);
+               gtk_box_pack_start(GTK_BOX(box), seph, WID_FIX);
+               gtk_box_pack_start(GTK_BOX(box), box2, WID_FIX);
+               
+               label=gtk_label_new(PACKAGE" release "VERSION);
+               gtk_box_pack_start(GTK_BOX(box2), label, WID_DYN);
+               gtk_misc_set_alignment(GTK_MISC(label), 0.1, 0.5);
+               gtk_widget_show(label);
+
+#ifdef USE_GTK2
+               label=gtk_label_new("Copyright (C) 1999-2002 by Alexander K\xC3\xB6nig");
+#else
+               label=gtk_label_new(about_prefix_umlaut);
+               gtk_label_get(GTK_LABEL(label), &str);
+               if (strlen(str)==0) {
+                       gtk_label_set(GTK_LABEL(label), about_prefix_broken_umlaut);\r
+               }
+#endif         
+               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);
+               
+               gtk_widget_show(seph);
+               gtk_widget_show(box2);
+               gtk_widget_show(box);
                gtk_widget_show(window);
                
                while (gtk_events_pending()) gtk_main_iteration();      
@@ -645,13 +679,14 @@ void show_about(int nag)
                label=gtk_label_new(buffer);
 
 #ifndef USE_GTK2
+               char *str;
                gtk_label_get(GTK_LABEL(label), &str);
                
                /* Fixing a strange gtk+ bug that appears at least on my system.
                */
                if (strlen(str)==0) 
                {
-                       fprintf (stderr, "tX: Warning: this gtk+ has broken umlauts.\n");
+                       tX_warning( "This gtk+ has broken umlauts.");
                        strcpy(buffer, about_prefix_broken_umlaut);
                        strcat(buffer, about_rest);
                        gtk_label_set(GTK_LABEL(label), buffer);                
@@ -706,7 +741,6 @@ void show_about(int nag)
                gtk_box_pack_start(GTK_BOX(hbox), scroll, WID_FIX);
                gtk_widget_show(scroll);
 #endif         
-
                
                add_about_wid(hbox);
 

diff --git a/src/tX_vttgui.cc b/src/tX_vttgui.cc
index 23d7cb1c2c6af20136ef7f21cb13320d36b48b84..dcfae11be568a1b48735376eb101259e0084479b 100644 (file)
--- a/src/tX_vttgui.cc
+++ b/src/tX_vttgui.cc
@@ -222,10 +222,10 @@ void drop_file(GtkWidget *widget, GdkDragContext *context,
 
        fn = strchr (filename, '\r');
        *fn=0;  
-
+       
+       char *realfn=NULL;
 #ifdef USE_GTK2        
        char *host=NULL;
-       char *realfn=NULL;
        
        realfn=g_filename_from_uri(filename, &host, NULL);
        if (realfn) {

diff --git a/terminatorX.spec.in b/terminatorX.spec.in
index 4519d0c36d318f50a44b3ef51c6d7fd8ee968219..641b811d41acd42941af848c56901c94222873fb 100644 (file)
--- a/terminatorX.spec.in
+++ b/terminatorX.spec.in
@@ -16,12 +16,14 @@ Requires: gtk+ >= 1.2.5
 
 %description
 terminatorX is a realtime audio synthesizer that allows you to "scratch" on
-digitally sampled audio data (*.wav, *.au, *.mp3, etc.) the way hiphop-DJs
-scratch on vinyl records. It features multiple turntables, realtime effects
-(buit-in as well as LADSPA plugin effects), a sequencer and an easy-to-use
-gtk+ GUI.
+digitally sampled audio data (*.wav, *.au, *.ogg, *.mp3, etc.) the way 
+hiphop-DJs scratch on vinyl records. It features multiple turntables, realtime
+effects (buit-in as well as LADSPA plugin effects), a sequencer and an
+easy-to-use gtk+ GUI.
 
 %changelog
+* Sat Sep 14 2002 Alexander König <alex@lisas.de>
+ - Switch from xpm to pngs for GNOME icons
 * Fri May 31 2002 Alexander König <alex@lisas.de>
  - Added Adrian's man page
 * Tue Mar 20 2001 Adrian Reber <adrian@lisas.de>
@@ -56,7 +58,7 @@ uname -a|grep SMP && make -j 2 || make
 
 MIMEDIR=$RPM_BUILD_ROOT%{_datadir}/mime-info
 ICONDIR=$RPM_BUILD_ROOT%{_datadir}/pixmaps
-ICONS="gnome-support/terminatorX-app.xpm gnome-support/terminatorX-mime.xpm"
+ICONS="gnome-support/terminatorX-app.png gnome-support/terminatorX-mime.png"
 MIMEFILES="gnome-support/terminatorX.keys gnome-support/terminatorX.mime"
 
 mkdir -p $MIMEDIR
@@ -73,7 +75,7 @@ Name=terminatorX
 Type=Application
 Comment=sophisticated scratching and audio tool
 Exec=terminatorX
-Icon=terminatorX-app.xpm
+Icon=terminatorX-app.png
 EOF
 )
 
@@ -87,6 +89,6 @@ find . -name "Makefile*" -print -exec rm -rf {} \;
 %{_mandir}/man1/terminatorX.1*
 %{_datadir}/mime-info/terminatorX.keys
 %{_datadir}/mime-info/terminatorX.mime
-%{_datadir}/pixmaps/terminatorX-app.xpm
-%{_datadir}/pixmaps/terminatorX-mime.xpm
+%{_datadir}/pixmaps/terminatorX-app.png
+%{_datadir}/pixmaps/terminatorX-mime.png
 %{_datadir}/gnome/apps/Multimedia/terminatorX.desktop