diff --git a/meson.build b/meson.build index 99b2fca..1c0f02b 100644 --- a/meson.build +++ b/meson.build @@ -83,7 +83,6 @@ hdr = [ 'src/tX_vttgui.h', 'src/tX_vtt.h', 'src/tX_widget.h', - 'src/version.h', 'src/wav_file.h' ] @@ -264,4 +263,4 @@ subdir('help') # data -subdir('data') \ No newline at end of file +subdir('data') diff --git a/src/main.cc b/src/main.cc index 961a4a5..10379fa 100644 --- a/src/main.cc +++ b/src/main.cc @@ -40,7 +40,6 @@ #include "tX_endian.h" #include "tX_global.h" #include "tX_types.h" -#include "version.h" #include #include #include @@ -192,7 +191,7 @@ int main(int argc, char** argv) { /* No suidroot below this comment. */ - fprintf(stderr, "%s - Copyright (C) 1999-2022 by Alexander König\n", VERSIONSTRING); + fprintf(stderr, "%s - Copyright (C) 1999-2022 by Alexander König\n", PACKAGE " release " VERSION); fprintf(stderr, "terminatorX comes with ABSOLUTELY NO WARRANTY - for details read the license.\n"); if (keep_caps_failed) { diff --git a/src/tX_dialog.cc b/src/tX_dialog.cc index dd30e8b..a6e1836 100644 --- a/src/tX_dialog.cc +++ b/src/tX_dialog.cc @@ -39,7 +39,6 @@ #include "tX_engine.h" #include "tX_maingui.h" #include "tX_vtt.h" -#include "version.h" #include extern "C" { @@ -782,7 +781,7 @@ void tX_set_icon(GtkWidget* widget) { tX_error("Error accessing tX_dialog resources: %s", error->message); } } - tX_window_icon = gdk_pixbuf_new_from_resource("/org/terminatorX/tX_dialog/../../icons/terminatorX.png", &error); + tX_window_icon = gdk_pixbuf_new_from_resource("/org/terminatorX/tX_dialog/../../data/icons/org.terminatorx.terminatorX.png", &error); if (error) { tX_error("Error rendering tX icon: %s", error->message); } diff --git a/src/tX_global.c b/src/tX_global.c index e9a7f79..2adf2e0 100644 --- a/src/tX_global.c +++ b/src/tX_global.c @@ -124,7 +124,7 @@ void set_global_defaults() { #endif #endif #endif - globals.interpolator_type = LINEAR; + globals.interpolator_type = SINC; globals.use_stdout_cmdline = 0; strcpy(globals.current_path, ""); diff --git a/src/tX_maingui.cc b/src/tX_maingui.cc index f06032f..1727244 100644 --- a/src/tX_maingui.cc +++ b/src/tX_maingui.cc @@ -37,7 +37,6 @@ #include "tX_ui_support.h" #include "tX_vtt.h" #include "tX_vttgui.h" -#include "version.h" #include #include #include diff --git a/src/version.h b/src/version.h deleted file mode 100644 index 62c8779..0000000 --- a/src/version.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - terminatorX - realtime audio scratching software - Copyright (C) 1999-2022 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program 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, see . - - File: version.h - - Description: pretty dumb version management header... -*/ - -#pragma once - -#include -#define VERSIONSTRING PACKAGE " release " VERSION