xiRetimer

commit

41e0a3f00ccd6bf07de012b4d70a73eef309895a

parent

22000299308dc16b6b9bf8d6a864728b17550d58

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2019-12-26 21:33

rm autotools

Diffstat

7 files changed, 6 insertions, 106 deletions

diff --git a/.gitignore b/.gitignore

@@ -1,11 +1,5 @@
    1     1 *.gch
    2     2 *.o
    3    -1 aclocal.m4
    4     3 *.cache
    5     4 config.log
    6     5 xiRetimer
    7    -1 configure
    8    -1 README
    9    -1 xiretimer.desktop
   10    -1 src/gui/retimer_wx.cpp
   11    -1 makefile

diff --git a/Makefile.in b/Makefile

@@ -1,9 +1,9 @@
    1     1 CC      = /usr/bin/g++
    2    -1 CFLAGS  = @_CFLAGS@ -DVERSION=\"@VERSION@\" `sdl-config --cflags` `pkg-config --cflags sndfile @_PKGC@` `wx-config --cppflags`
    3    -1 LDFLAGS = `sdl-config --libs` `pkg-config --libs sndfile @_PKGC@` `wx-config --libs`
   -1     2 CFLAGS  =  -DICONS_GNOME -DMODE_RUBBERBAND -DENABLE_MP3 -DVERSION=\"0.2\" `sdl-config --cflags` `pkg-config --cflags sndfile rubberband` `wx-config --cppflags`
   -1     3 LDFLAGS = `sdl-config --libs` `pkg-config --libs sndfile rubberband` `wx-config --libs`
    4     4 
    5    -1 @NAME@: .gui .back
    6    -1 	$(CC) -o @NAME@ *.o $(LDFLAGS)
   -1     5 xiRetimer: .gui .back
   -1     6 	$(CC) -o xiRetimer *.o $(LDFLAGS)
    7     7 
    8     8 .gui: src/gui/*.cpp src/gui/*.h
    9     9 	$(CC) $(CFLAGS) -c src/gui/*.cpp src/gui/*.h
@@ -16,4 +16,3 @@ LDFLAGS = `sdl-config --libs` `pkg-config --libs sndfile @_PKGC@` `wx-config --l
   16    16 .PHONY: clean
   17    17 clean:
   18    18 	rm -f *.o src/*.gch src/gui/*.gch .gui .back
   19    -1 

diff --git a/README.in b/README

@@ -1,4 +1,4 @@
    1    -1 xiRetimer v @VERSION@
   -1     1 xiRetimer
    2     2 
    3     3 Tool to fit recordet Audio to a tempo.
    4     4 

diff --git a/build.sh b/build.sh

@@ -1,7 +0,0 @@
    1    -1 #!/bin/bash
    2    -1 aclocal
    3    -1 autoconf
    4    -1 ./configure
    5    -1 make
    6    -1 make clean
    7    -1 rm -rf aclocal.m4 autom4te.cache config.log config.status

diff --git a/configure.ac b/configure.ac

@@ -1,84 +0,0 @@
    1    -1 AC_INIT([retimer], [0.2], [])
    2    -1 AC_CONFIG_SRCDIR([src/playback.h])
    3    -1 
    4    -1 VERSION=0.2
    5    -1 NAME=xiRetimer
    6    -1 AC_SUBST(VERSION)
    7    -1 AC_SUBST(NAME)
    8    -1 
    9    -1 # Checks for programs.
   10    -1 AC_PROG_CXX
   11    -1 AC_PROG_CC
   12    -1 
   13    -1 AC_SUBST(_CFLAGS)
   14    -1 AC_SUBST(_PKGC)
   15    -1 
   16    -1 # check files
   17    -1 AC_CHECK_FILES(
   18    -1 	/usr/share/icons/gnome/16x16/actions/fileopen.png
   19    -1 	/usr/share/icons/gnome/16x16/actions/document-save.png
   20    -1 	/usr/share/icons/gnome/16x16/actions/document-properties.png
   21    -1 	/usr/share/icons/gnome/16x16/actions/window-close.png
   22    -1 	/usr/share/icons/gnome/16x16/actions/media-playback-start.png
   23    -1 	/usr/share/icons/gnome/16x16/actions/media-skip-backward.png
   24    -1 	/usr/share/icons/gnome/16x16/actions/edit-clear.png
   25    -1 	/usr/share/icons/gnome/16x16/actions/stock_refresh.png
   26    -1 	/usr/share/icons/gnome/16x16/actions/help-about.png,
   27    -1 	[],[icons="error"])
   28    -1 
   29    -1 if test "x$icons" = "x" ; then
   30    -1   _CFLAGS="$_CFLAGS -DICONS_GNOME"
   31    -1   echo "  Compiling with Gnome icons"
   32    -1 else
   33    -1   _CFLAGS="$_CFLAGS -UICONS_GNOME"
   34    -1   echo "  Compiling without Gnome icons!"
   35    -1 fi
   36    -1 
   37    -1 # Checks for libraries.
   38    -1 AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
   39    -1 if test x$HAVE_PKG_CONFIG = xno ; then
   40    -1    AC_MSG_ERROR([pkg-config is required for compilation!])
   41    -1 fi
   42    -1 
   43    -1 AC_CHECK_PROG(HAVE_WX_CONFIG, wx-config, yes, no)
   44    -1 if test x$HAVE_WX_CONFIG = xno ; then
   45    -1    AC_MSG_ERROR([wx-config is required for compilation! Is wxWidgets installed?])
   46    -1 fi
   47    -1 
   48    -1 AC_CHECK_PROG(HAVE_SDL_CONFIG, sdl-config, yes, no)
   49    -1 if test x$HAVE_SDL_CONFIG = xno ; then
   50    -1    AC_MSG_ERROR([sdl-config is required for compilation! Is SDL installed?])
   51    -1 fi
   52    -1 
   53    -1 PKG_CHECK_MODULES([SNDFILE],[sndfile])
   54    -1 
   55    -1 PKG_CHECK_MODULES([RubberBand],[rubberband >= 1.4],
   56    -1 	[
   57    -1 	_CFLAGS="$_CFLAGS -DMODE_RUBBERBAND"
   58    -1 	_PKGC="$_PKGC rubberband"
   59    -1 	echo "  Compiling with RubberBand support"],
   60    -1 	[
   61    -1 	_CFLAGS="$_CFLAGS -UMODE_RUBBERBAND"
   62    -1 	echo "  Compiling without RubberBand support!"
   63    -1 	])
   64    -1 
   65    -1 PKG_CHECK_MODULES([MAD],[mad],
   66    -1 	[
   67    -1 	_CFLAGS="$_CFLAGS -DENABLE_MP3"
   68    -1 	#_PKGC="$_PKGC rubberband"
   69    -1 	echo "  Compiling with mp3 support"],
   70    -1 	[
   71    -1 	_CFLAGS="$_CFLAGS -UENABLE_MP3"
   72    -1 	echo "  Compiling without mp3 support!"
   73    -1 	])
   74    -1 
   75    -1 # Checks for typedefs, structures, and compiler characteristics.
   76    -1 AC_HEADER_STDBOOL
   77    -1 
   78    -1 AC_CONFIG_FILES([
   79    -1 	Makefile
   80    -1 	src/gui/retimer_wx.cpp
   81    -1 	xiretimer.desktop
   82    -1 	README
   83    -1 	])
   84    -1 AC_OUTPUT

diff --git a/src/gui/retimer_wx.cpp.in b/src/gui/retimer_wx.cpp

@@ -151,7 +151,7 @@ AboutDialog::AboutDialog(wxWindow* parent, wxWindowID id, const wxString& title,
  151   151 	wxBoxSizer* bSizer14;
  152   152 	bSizer14 = new wxBoxSizer(wxVERTICAL);
  153   153 
  154    -1 	m_staticText7 = new wxStaticText(this, wxID_ANY, wxT("xiRetimer v@VERSION@"), wxDefaultPosition, wxDefaultSize, 0);
   -1   154 	m_staticText7 = new wxStaticText(this, wxID_ANY, "xiRetimer v" VERSION, wxDefaultPosition, wxDefaultSize, 0);
  155   155 	m_staticText7->Wrap(-1);
  156   156 	bSizer14->Add(m_staticText7, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
  157   157 

diff --git a/xiretimer.desktop.in b/xiretimer.desktop

@@ -4,8 +4,6 @@ Comment[en]=warp audio files
    4     4 
    5     5 GenericName=retimer
    6     6 
    7    -1 Version=@VERSION@
    8    -1 
    9     7 Type=Application
   10     8 Categories=AudioVideo;Audio;
   11     9