--- TiMidity++-2.14.0.old/autoconf/Makefile.am +++ TiMidity++-2.14.0/autoconf/Makefile.am @@ -25,7 +25,6 @@ gtk.m4 \ gtk-2.0.m4 \ libFLAC.m4 \ - libOggFLAC.m4 \ ogg.m4 \ utils.m4 \ vorbis.m4 \ No newline at end of file --- TiMidity++-2.14.0.old/autoconf/libOggFLAC.m4 +++ TiMidity++-2.14.0/autoconf/libOggFLAC.m4 @@ -1,116 +0,0 @@ -# Configure paths for libOggFLAC -# "Inspired" by ogg.m4 - -dnl AM_PATH_LIBOGGFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libOggFLAC, and define LIBOGGFLAC_CFLAGS and LIBOGGFLAC_LIBS -dnl -AC_DEFUN([AM_PATH_LIBOGGFLAC], -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(libOggFLAC, - AS_HELP_STRING([--with-libOggFLAC=PFX], - [Prefix where libOggFLAC is installed (optional)]), - [libOggFLAC_prefix="$withval"], [libOggFLAC_prefix=""]) -AC_ARG_WITH(libOggFLAC-libraries, - AS_HELP_STRING([--with-libOggFLAC-libraries=DIR], - [Directory where libOggFLAC library is installed (optional)]), - [libOggFLAC_libraries="$withval"], [libOggFLAC_libraries=""]) -AC_ARG_WITH(libOggFLAC-includes, - AS_HELP_STRING([--with-libOggFLAC-includes=DIR], - [Directory where libOggFLAC header files are installed (optional)]), - [libOggFLAC_includes="$withval"], [libOggFLAC_includes=""]) -AC_ARG_ENABLE(libOggFLACtest, - AS_HELP_STRING([--disable-libOggFLACtest], - [Do not try to compile and run a test libOggFLAC program]),, - [enable_libOggFLACtest=yes]) - - if test "x$libOggFLAC_libraries" != "x" ; then - LIBOGGFLAC_LIBS="-L$libOggFLAC_libraries" - elif test "x$libOggFLAC_prefix" != "x" ; then - LIBOGGFLAC_LIBS="-L$libOggFLAC_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - LIBOGGFLAC_LIBS="-L$prefix/lib" - fi - - LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm" - - if test "x$libOggFLAC_includes" != "x" ; then - LIBOGGFLAC_CFLAGS="-I$libOggFLAC_includes" - elif test "x$libOggFLAC_prefix" != "x" ; then - LIBOGGFLAC_CFLAGS="-I$libOggFLAC_prefix/include" - elif test "$prefix" != "xNONE"; then - LIBOGGFLAC_CFLAGS="-I$prefix/include" - fi - - AC_MSG_CHECKING(for libOggFLAC) - no_libOggFLAC="" - - - if test "x$enable_libOggFLACtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS" - CXXFLAGS="$CXXFLAGS $LIBOGGFLAC_CFLAGS" - LIBS="$LIBS $LIBOGGFLAC_LIBS" -dnl -dnl Now check if the installed libOggFLAC is sufficiently new. -dnl - rm -f conf.libOggFLACtest - AC_TRY_RUN([ -#include -#include -#include -#include - -int main () -{ - system("touch conf.libOggFLACtest"); - return 0; -} - -],, no_libOggFLAC=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_libOggFLAC" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.libOggFLACtest ; then - : - else - echo "*** Could not run libOggFLAC test program, checking why..." - CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS" - LIBS="$LIBS $LIBOGGFLAC_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding libOggFLAC or finding the wrong" - echo "*** version of libOggFLAC. If it is not finding libOggFLAC, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means libOggFLAC was incorrectly installed" - echo "*** or that you have moved libOggFLAC since it was installed. In the latter case, you" - echo "*** may want to edit the libOggFLAC-config script: $LIBOGGFLAC_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - LIBOGGFLAC_CFLAGS="" - LIBOGGFLAC_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(LIBOGGFLAC_CFLAGS) - AC_SUBST(LIBOGGFLAC_LIBS) - rm -f conf.libOggFLACtest -]) --- TiMidity++-2.14.0.old/configure.in +++ TiMidity++-2.14.0/configure.in @@ -36,7 +36,7 @@ dnl C_INCLUDE_PATH dnl - add to -I CPPFLAGS dnl MSYS - `yes' if cygnus or Mingw windows environment. -dnl WISH - wish +dnl TCLSH - tclsh dnl LN_S - ln -s dnl tcltk_dep - make dependencies for tcl/tk interface dnl @@ -59,7 +59,7 @@ AM_MAINTAINER_MODE SHELL=${CONFIG_SHELL-"/bin/sh"} -WISH=${WISH-"wish"} +TCLSH=${TCLSH-"tclsh"} dnl to use contains() macro (see autoconf/acinclude.m4) CONTAINS_INIT @@ -889,7 +889,7 @@ jack: JACK ao: Libao vorbis: Ogg Vorbis - flac: FLAC / OggFLAC + flac: FLAC speex: Ogg Speex gogo: MP3 GOGO (Only Windows is supported) ], @@ -1393,23 +1393,10 @@ AC_MSG_CHECKING(enable_audio=flac) if test "x$au_enable_flac" = xyes; then AC_MSG_RESULT([yes, configuring flac]) - SYSEXTRAS="$SYSEXTRAS flac_a.c w32_libFLAC_dll.c w32_libOggFLAC_dll.c" + SYSEXTRAS="$SYSEXTRAS flac_a.c w32_libFLAC_dll.c" AC_CHECK_HEADER(FLAC/all.h, [ EXTRADEFS="$EXTRADEFS -DAU_FLAC -DAU_FLAC_DLL" ]) - AC_CHECK_HEADER(OggFLAC/all.h, [ - EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC -DAU_OGGFLAC_DLL" - ]) -dnl AM_PATH_LIBFLAC([ -dnl EXTRADEFS="$EXTRADEFS -DAU_FLAC -DAU_FLAC_DLL" -dnl EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBFLAC_CFLAGS) -dnl LIBS="$LIBS $LIBFLAC_LIBS" -dnl ]) -dnl AM_PATH_LIBOGGFLAC([ -dnl EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC -DAU_OGGFLAC_DLL" -dnl EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS) -dnl LIBS="$LIBS $LIBOGGFLAC_LIBS" -dnl ]) else AC_MSG_RESULT(no) fi @@ -1423,11 +1410,6 @@ EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBFLAC_CFLAGS) LIBS="$LIBS $LIBFLAC_LIBS" ]) - AM_PATH_LIBOGGFLAC([ - EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC" - EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS) - LIBS="$LIBS $LIBOGGFLAC_LIBS" - ]) else AC_MSG_RESULT(no) fi @@ -2287,7 +2269,7 @@ AC_SUBST(dynamic_targets) AC_SUBST(so) AC_SUBST(LN_S) -AC_SUBST(WISH) +AC_SUBST(TCLSH) AC_SUBST(tcltk_dep) AC_SUBST(program_transform_name) AC_SUBST(INTERFACE_SRCS) --- TiMidity++-2.14.0.old/interface/Makefile.am +++ TiMidity++-2.14.0/interface/Makefile.am @@ -240,8 +240,7 @@ tkpanel.tcl \ browser.tcl \ misc.tcl \ - timidity.pel \ - tclIndex + timidity.pel .ptcl.tcl: sed -e 's@%TCL_DIR%@$(TCL_DIR)@g' $< > $@ @@ -249,6 +248,8 @@ sed -e 's@%BIN_DIR%@$(bindir)@g' $< > $@ clean: rm -f tkmidity.tcl + rm -f tclIndex + rm -f timidity.el rm -f *.$(OBJEXT) rm -f *.$(so) rm -f *.res @@ -259,7 +260,7 @@ tclIndex: $(TCLSRCS) rm -f tclIndex - echo 'auto_mkindex . *.tcl; exit' | $(WISH) + echo 'auto_mkindex $(srcdir) *.tcl; exit' | $(TCLSH) if ENABLE_TCLTK install_tk = install.tk @@ -275,7 +276,7 @@ install_xaw = install.xaw endif -install.tk: $(ALLTCLF) install.bitmaps +install.tk: $(ALLTCLF) test -d $(DESTDIR)$(TCL_DIR) || mkdir -p $(DESTDIR)$(TCL_DIR) for f in $(ALLTCLF) ''; do case ".$$f" in .);; *) $(INSTALL_DATA) $$f $(DESTDIR)$(TCL_DIR);; esac; done --- TiMidity++-2.14.0.old/interface/tclIndex +++ TiMidity++-2.14.0/interface/tclIndex @@ -1,62 +0,0 @@ -# Tcl autoload index file, version 2.0 -# This file is generated by the "auto_mkindex" command -# and sourced to set up indexing information for one or -# more commands. Typically each line is a command that -# sets an element in the auto_index array, where the -# element name is the name of a command and the value is -# a script that loads the command. - -set auto_index(InitGlobal) [list source [file join $dir tkpanel.tcl]] -set auto_index(HandleInput) [list source [file join $dir tkpanel.tcl]] -set auto_index(MakeShuffleList) [list source [file join $dir tkpanel.tcl]] -set auto_index(AppendMsg) [list source [file join $dir tkpanel.tcl]] -set auto_index(ClearMsg) [list source [file join $dir tkpanel.tcl]] -set auto_index(SelectNumber) [list source [file join $dir tkpanel.tcl]] -set auto_index(SetTime) [list source [file join $dir tkpanel.tcl]] -set auto_index(DispButtonPlay) [list source [file join $dir tkpanel.tcl]] -set auto_index(SetVolume) [list source [file join $dir tkpanel.tcl]] -set auto_index(WriteMsg) [list source [file join $dir tkpanel.tcl]] -set auto_index(JumpCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(VolumeCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(LoadCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(PlayCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(PauseCheck) [list source [file join $dir tkpanel.tcl]] -set auto_index(PauseCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(StopCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(QuitCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(PrevCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(NextCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(ForwardCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(BackwardCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(VolUpCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(VolDownCmd) [list source [file join $dir tkpanel.tcl]] -set auto_index(DispTables) [list source [file join $dir tkpanel.tcl]] -set auto_index(SaveConfig) [list source [file join $dir tkpanel.tcl]] -set auto_index(LoadConfig) [list source [file join $dir tkpanel.tcl]] -set auto_index(InitCmdLine) [list source [file join $dir tkpanel.tcl]] -set auto_index(SelectList) [list source [file join $dir tkpanel.tcl]] -set auto_index(OpenFiles) [list source [file join $dir tkpanel.tcl]] -set auto_index(CloseFiles) [list source [file join $dir tkpanel.tcl]] -set auto_index(ToggleCurFileMode) [list source [file join $dir tkpanel.tcl]] -set auto_index(CreateWindow) [list source [file join $dir tkpanel.tcl]] -set auto_index(filebrowser) [list source [file join $dir browser.tcl]] -set auto_index(fs:init) [list source [file join $dir browser.tcl]] -set auto_index(fs:init-lbox) [list source [file join $dir browser.tcl]] -set auto_index(fs:get-cur-lbox) [list source [file join $dir browser.tcl]] -set auto_index(fs:select) [list source [file join $dir browser.tcl]] -set auto_index(fs:selall) [list source [file join $dir browser.tcl]] -set auto_index(fs:updir) [list source [file join $dir browser.tcl]] -set auto_index(fs:changedir) [list source [file join $dir browser.tcl]] -set auto_index(fs:update) [list source [file join $dir browser.tcl]] -set auto_index(retrieve-filename) [list source [file join $dir misc.tcl]] -set auto_index(sec2time) [list source [file join $dir misc.tcl]] -set auto_index(numeric-bind) [list source [file join $dir misc.tcl]] -set auto_index(my-listbox) [list source [file join $dir misc.tcl]] -set auto_index(my-dialog) [list source [file join $dir misc.tcl]] -set auto_index(warning) [list source [file join $dir misc.tcl]] -set auto_index(error) [list source [file join $dir misc.tcl]] -set auto_index(information) [list source [file join $dir misc.tcl]] -set auto_index(question) [list source [file join $dir misc.tcl]] -set auto_index(rootname) [list source [file join $dir misc.tcl]] -set auto_index(my-random) [list source [file join $dir misc.tcl]] -set auto_index(init-random) [list source [file join $dir misc.tcl]] --- TiMidity++-2.14.0.old/interface/tk_c.c +++ TiMidity++-2.14.0/interface/tk_c.c @@ -46,8 +46,6 @@ #include #include #include -#include -#include #include #include "timidity.h" @@ -60,6 +58,9 @@ #include "miditrace.h" #include "aq.h" +#include +#include + #ifndef TKPROGPATH #define TKPROGPATH PKGLIBDIR "/tkmidity.tcl" #endif /* TKPROGPATH */ @@ -871,6 +872,21 @@ static int AppInit(Tcl_Interp *interp) { +#include "bitmaps/back.xbm" +#include "bitmaps/fwrd.xbm" +#include "bitmaps/next.xbm" +#include "bitmaps/pause.xbm" +#include "bitmaps/play.xbm" +#include "bitmaps/prev.xbm" +#include "bitmaps/quit.xbm" +#include "bitmaps/stop.xbm" +#include "bitmaps/timidity.xbm" + +#define DefineBitmap(Bitmap) do { \ + Tk_DefineBitmap (interp, Tk_GetUid(#Bitmap), Bitmap##_bits, \ + Bitmap##_width, Bitmap##_height); \ + } while(0) + my_interp = interp; if (Tcl_Init(interp) == TCL_ERROR) { @@ -890,7 +906,19 @@ (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); Tcl_CreateCommand(interp, "TraceUpdate", (Tcl_CmdProc*) TraceUpdate, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL); + + DefineBitmap(back); + DefineBitmap(fwrd); + DefineBitmap(next); + DefineBitmap(pause); + DefineBitmap(play); + DefineBitmap(prev); + DefineBitmap(quit); + DefineBitmap(stop); + DefineBitmap(timidity); + return TCL_OK; +#undef DefineBitmap } /*ARGSUSED*/ @@ -913,7 +941,7 @@ vsnprintf(buf, sizeof(buf), fmt, ap); Tcl_Eval(my_interp, buf); va_end(ap); - return my_interp->result; + return Tcl_GetStringResult(my_interp); } static const char *v_get2(const char *v1, const char *v2) --- TiMidity++-2.14.0.old/interface/tkpanel.tcl +++ TiMidity++-2.14.0/interface/tkpanel.tcl @@ -87,7 +87,7 @@ wm title . "TkMidity" wm iconname . "TkMidity" global bitmap_path - wm iconbitmap . @$bitmap_path/timidity.xbm + wm iconbitmap . "timidity" } @@ -825,22 +825,14 @@ global bitmap_path frame .body.button -relief raised -bd 1 pack .body.button -side top -expand 1 -fill x - button .body.button.play -bitmap @$bitmap_path/play.xbm\ - -command "PlayCmd" - button .body.button.stop -bitmap @$bitmap_path/stop.xbm\ - -command "StopCmd" - button .body.button.prev -bitmap @$bitmap_path/prev.xbm\ - -command "PrevCmd" - button .body.button.back -bitmap @$bitmap_path/back.xbm\ - -command "BackwardCmd" - button .body.button.fwrd -bitmap @$bitmap_path/fwrd.xbm\ - -command "ForwardCmd" - button .body.button.next -bitmap @$bitmap_path/next.xbm\ - -command "NextCmd" - button .body.button.pause -bitmap @$bitmap_path/pause.xbm\ - -command "PauseCmd" - button .body.button.quit -bitmap @$bitmap_path/quit.xbm\ - -command "QuitCmd" + button .body.button.play -bitmap "play" -command "PlayCmd" + button .body.button.stop -bitmap "stop" -command "StopCmd" + button .body.button.prev -bitmap "prev" -command "PrevCmd" + button .body.button.back -bitmap "back" -command "BackwardCmd" + button .body.button.fwrd -bitmap "fwrd" -command "ForwardCmd" + button .body.button.next -bitmap "next" -command "NextCmd" + button .body.button.pause -bitmap "pause" -command "PauseCmd" + button .body.button.quit -bitmap "quit" -command "QuitCmd" pack .body.button.play .body.button.pause\ .body.button.prev .body.button.back\ .body.button.stop\ --- TiMidity++-2.14.0.old/timidity/Makefile.am +++ TiMidity++-2.14.0/timidity/Makefile.am @@ -157,11 +157,7 @@ w32_libFLAC_dll.c \ w32_libFLAC_dll.h \ w32_libFLAC_dll_g.h \ - w32_libFLAC_dll_i.h \ - w32_libOggFLAC_dll.c \ - w32_libOggFLAC_dll.h \ - w32_libOggFLAC_dll_g.h \ - w32_libOggFLAC_dll_i.h + w32_libFLAC_dll_i.h calcnewt_SOURCES = calcnewt.c @@ -442,7 +438,7 @@ version.$(OBJEXT): version.c ../configure $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c $(srcdir)/version.c -resample.c: newton_table.c +$(srcdir)/resample.c: newton_table.c if VCPP newton_table.c: calcnewt$(EXEEXT)