Revert "Merge branch 'master' into v0.1"

This reverts commit a567462, reversing
changes made to 8dcbc3f.

AUTHORS

@@ -17,6 +17,17 @@ http://lala.c64.org/
 
 ####################################################################
 
+Game_Music_Emu library 0.6.2
+Copyright (C) 2003-2010 Shay Green
+Copyright (C) 2009-2017 Michael Pyne
+http://www.slack.net/~ant/
+https://bitbucket.org/mpyne/game-music-emu/
+
+Sega Genesis YM2612 emulator
+Copyright (C) 2002 Stephane Dallongeville.
+
+####################################################################
+
 TTA Library 2.2
 Copyright (C) 1999-2014 Alexander Djourik
 http://www.true-audio.com/

Makefile.am

@@ -5,6 +5,7 @@ AUTOMAKE_OPTIONS = foreign
 SUBDIRS = po
 
 DISTCHECK_CONFIGURE_FLAGS = \
+--enable-gme-plugin \
 --enable-hvl-plugin \
 --enable-tta-plugin
 
@@ -26,6 +27,11 @@ musiqt.png \
 src/resources.qrc \
 src/icons \
 src/resources \
+src/libs/gme/changes.txt \
+src/libs/gme/design.txt \
+src/libs/gme/gme.txt \
+src/libs/gme/license.txt \
+src/libs/gme/readme.txt \
 src/libs/hvl_replay/ChangeLog.txt \
 src/libs/stilview/README.txt \
 src/libs/libtta/README \
@@ -86,6 +92,109 @@ src/audio/input/opusBackend_moc.cpp
 endif
 
 if GME
+GMESOURCES = \
+src/libs/gme/Ay_Apu.h \
+src/libs/gme/Ay_Apu.cpp \
+src/libs/gme/Ay_Cpu.h \
+src/libs/gme/Ay_Cpu.cpp \
+src/libs/gme/Ay_Emu.h \
+src/libs/gme/Ay_Emu.cpp \
+src/libs/gme/blargg_common.h \
+src/libs/gme/blargg_config.h \
+src/libs/gme/blargg_endian.h \
+src/libs/gme/blargg_source.h \
+src/libs/gme/Blip_Buffer.h \
+src/libs/gme/Blip_Buffer.cpp \
+src/libs/gme/Classic_Emu.h \
+src/libs/gme/Classic_Emu.cpp \
+src/libs/gme/Data_Reader.h \
+src/libs/gme/Data_Reader.cpp \
+src/libs/gme/Dual_Resampler.h \
+src/libs/gme/Dual_Resampler.cpp \
+src/libs/gme/Effects_Buffer.h \
+src/libs/gme/Effects_Buffer.cpp \
+src/libs/gme/Fir_Resampler.h \
+src/libs/gme/Fir_Resampler.cpp \
+src/libs/gme/Gb_Apu.h \
+src/libs/gme/Gb_Apu.cpp \
+src/libs/gme/Gb_Cpu.h \
+src/libs/gme/Gb_Cpu.cpp \
+src/libs/gme/gb_cpu_io.h \
+src/libs/gme/Gb_Oscs.h \
+src/libs/gme/Gb_Oscs.cpp \
+src/libs/gme/Gbs_Emu.h \
+src/libs/gme/Gbs_Emu.cpp \
+src/libs/gme/Gme_File.h \
+src/libs/gme/Gme_File.cpp \
+src/libs/gme/gme.h \
+src/libs/gme/gme.cpp \
+src/libs/gme/gme_types.h \
+src/libs/gme/Gym_Emu.h \
+src/libs/gme/Gym_Emu.cpp \
+src/libs/gme/Hes_Apu.h \
+src/libs/gme/Hes_Apu.cpp \
+src/libs/gme/Hes_Cpu.h \
+src/libs/gme/Hes_Cpu.cpp \
+src/libs/gme/hes_cpu_io.h \
+src/libs/gme/Hes_Emu.h \
+src/libs/gme/Hes_Emu.cpp \
+src/libs/gme/Kss_Cpu.h \
+src/libs/gme/Kss_Cpu.cpp \
+src/libs/gme/Kss_Emu.h \
+src/libs/gme/Kss_Emu.cpp \
+src/libs/gme/Kss_Scc_Apu.h \
+src/libs/gme/Kss_Scc_Apu.cpp \
+src/libs/gme/M3u_Playlist.h \
+src/libs/gme/M3u_Playlist.cpp \
+src/libs/gme/Multi_Buffer.h \
+src/libs/gme/Multi_Buffer.cpp \
+src/libs/gme/Music_Emu.h \
+src/libs/gme/Music_Emu.cpp \
+src/libs/gme/Nes_Apu.h \
+src/libs/gme/Nes_Apu.cpp \
+src/libs/gme/Nes_Cpu.h \
+src/libs/gme/Nes_Cpu.cpp \
+src/libs/gme/nes_cpu_io.h \
+src/libs/gme/Nes_Fme7_Apu.h \
+src/libs/gme/Nes_Fme7_Apu.cpp \
+src/libs/gme/Nes_Namco_Apu.h \
+src/libs/gme/Nes_Namco_Apu.cpp \
+src/libs/gme/Nes_Oscs.h \
+src/libs/gme/Nes_Oscs.cpp \
+src/libs/gme/Nes_Vrc6_Apu.h \
+src/libs/gme/Nes_Vrc6_Apu.cpp \
+src/libs/gme/Nsfe_Emu.h \
+src/libs/gme/Nsfe_Emu.cpp \
+src/libs/gme/Nsf_Emu.h \
+src/libs/gme/Nsf_Emu.cpp \
+src/libs/gme/Sap_Apu.h \
+src/libs/gme/Sap_Apu.cpp \
+src/libs/gme/Sap_Cpu.h \
+src/libs/gme/Sap_Cpu.cpp \
+src/libs/gme/sap_cpu_io.h \
+src/libs/gme/Sap_Emu.h \
+src/libs/gme/Sap_Emu.cpp \
+src/libs/gme/Sms_Apu.h \
+src/libs/gme/Sms_Apu.cpp \
+src/libs/gme/Sms_Oscs.h \
+src/libs/gme/Snes_Spc.h \
+src/libs/gme/Snes_Spc.cpp \
+src/libs/gme/Spc_Cpu.h \
+src/libs/gme/Spc_Cpu.cpp \
+src/libs/gme/Spc_Dsp.h \
+src/libs/gme/Spc_Dsp.cpp \
+src/libs/gme/Spc_Emu.h \
+src/libs/gme/Spc_Emu.cpp \
+src/libs/gme/Spc_Filter.h \
+src/libs/gme/Spc_Filter.cpp \
+src/libs/gme/Vgm_Emu.h \
+src/libs/gme/Vgm_Emu.cpp \
+src/libs/gme/Vgm_Emu_Impl.h \
+src/libs/gme/Vgm_Emu_Impl.cpp \
+src/libs/gme/Ym2413_Emu.h \
+src/libs/gme/Ym2413_Emu.cpp \
+src/libs/gme/Ym2612_Emu.h \
+src/libs/gme/Ym2612_Emu.cpp 
 GME_SOURCES =\
 src/audio/input/gmeBackend.h \
 src/audio/input/gmeBackend.cpp
@@ -182,9 +291,7 @@ $(QT_CFLAGS) \
 $(BS2B_CFLAGS) \
 $(OPENMPT_CFLAGS) \
 $(VORBIS_CFLAGS) \
-$(MPG123_CFLAGS) \
 $(OPUS_CFLAGS) \
-$(GME_CFLAGS) \
 $(SIDPLAYFP_CFLAGS) \
 $(STILVIEW_CFLAGS) \
 $(SNDFILE_CFLAGS) \
@@ -199,9 +306,7 @@ $(ALSA_LIBS) \
 $(BS2B_LIBS) \
 $(OPENMPT_LIBS) \
 $(VORBIS_LIBS) \
-$(MPG123_LIBS) \
 $(OPUS_LIBS) \
-$(GME_LIBS) \
 $(SIDPLAYFP_LIBS) \
 $(STILVIEW_LIBS) \
 $(SNDFILE_LIBS) \
@@ -290,6 +395,7 @@ src/trackList/trackListPls.h \
 src/trackList/trackListCue.h \
 $(ZLIBSOURCES) \
 $(STILVIEWSOURCES) \
+$(GMESOURCES) \
 $(HVLSOURCES) \
 $(TTASOURCES) \
 src/utils/AutoDLL.h \

README

@@ -60,17 +60,17 @@ ahx, hvl
 mp3
 
 Note:
-ffmpeg backend is enabled only when needed libraries are found
+Mpg123 and ffmpeg backends are enabled only when needed libraries are found
 at runtime, so you need to install them on your own.
 Beware that these libraries may contain patented code and support some
 proprietary codec.
 
 Some Linux distro already ships these libraries.
-(libavcodec.so, libavformat.so and libavutil.so)
+(libmpg123.so, libavcodec.so, libavformat.so and libavutil.so)
 
 On Windows you have to manually put them under the System folder
 or in the same folder as musiqt binary.
-(avcodec-56.dll, avformat-56.dll and avutil-54.dll)
+(libmpg123-0.dll, avcodec-56.dll, avformat-56.dll and avutil-54.dll)
 
 ####################################################################
 
@@ -130,7 +130,4 @@ http://www.ffmpeg.org/
 libmpg123 >= 1.6.x
 http://mpg123.org/
 
-game-music-emu >= 0.6
-https://bitbucket.org/mpyne/game-music-emu/
-
 ####################################################################

configure.ac

@@ -1,6 +1,6 @@
 # Process this file with autoconf to create configure.
 
-AC_INIT([musiqt],[0.2.0],[https://github.com/drfiemost/musiqt/issues/],[musiqt],[https://github.com/drfiemost/musiqt/])
+AC_INIT([musiqt],[0.1.1],[https://github.com/drfiemost/musiqt/issues/],[musiqt],[https://github.com/drfiemost/musiqt/])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_AUX_DIR([config])
@@ -118,16 +118,8 @@ AM_CONDITIONAL([SNDFILE], [test "x$pkg_cv_SNDFILE_LIBS" != "x"])
 ##################################################################
 # Search for libmpg123
 
-AC_ARG_ENABLE([mpg123-plugin], [AS_HELP_STRING([--disable-mpg123-plugin], [disable mpg123 backend])])
-
-AS_IF([test "x$enable_mpg123_plugin" != xno],
-    [PKG_CHECK_MODULES(MPG123,
-        [libmpg123 >= 1.6],
-        [AC_DEFINE([HAVE_MPG123], 1, [Define to 1 if you have libmpg123 (-lmpg123).])],
-        [AC_MSG_WARN([$MPG123_PKG_ERRORS])]
-    )]
-)
-AM_CONDITIONAL([MPG123], [test "x$pkg_cv_MPG123_LIBS" != "x"])
+AC_CHECK_HEADERS([mpg123.h])
+AM_CONDITIONAL([MPG123], [test "x$ac_cv_header_mpg123_h" = "xyes"])
 
 ##################################################################
 # Search for ffmpeg
@@ -172,16 +164,12 @@ AM_CONDITIONAL([OPUS], [test "x$pkg_cv_OPUS_LIBS" != "x"])
 ##################################################################
 # Check if we should build Game Music Engine backend
 
-AC_ARG_ENABLE([gme-plugin], [AS_HELP_STRING([--disable-gme-plugin], [disable Game_Music_Emu backend])])
+AC_ARG_ENABLE([gme-plugin], [AS_HELP_STRING([--enable-gme-plugin], [enable Game_Music_Emu backend])])
 
-AS_IF([test "x$enable_gme_plugin" != xno],
-    [PKG_CHECK_MODULES(GME,
-        [libgme >= 0.6],
-        [AC_DEFINE([HAVE_GME], 1, [Define to 1 if you have libgme (-lgme).])],
-        [AC_MSG_WARN([$GME_PKG_ERRORS])]
-    )]
+AS_IF([test "x$enable_gme_plugin" = xyes],
+    [AC_DEFINE([BUILD_GME], 1, [Define to 1 if you want the Game_Music_Emu backend.])]
 )
-AM_CONDITIONAL([GME], [test "x$pkg_cv_GME_LIBS" != "x"])
+AM_CONDITIONAL([GME], [test "x$enable_gme_plugin" = xyes])
 
 ##################################################################
 # Check if we should build Hively backend

po/es.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: https://github.com/drfiemost/musiqt/issues/\n"
-"POT-Creation-Date: 2018-08-21 15:39+0200\n"
+"POT-Creation-Date: 2018-09-04 21:18+0200\n"
 "PO-Revision-Date: 2018-09-04 21:19+0200\n"
 "Last-Translator: Dr. Fiemost\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -519,7 +519,7 @@ msgstr "Año"
 msgid "arturl"
 msgstr "Rutaimagen"
 
-#: src/audio/input/ffmpegBackend.cpp:349 src/audio/input/gmeBackend.cpp:201
+#: src/audio/input/ffmpegBackend.cpp:349 src/audio/input/gmeBackend.cpp:182
 #: src/audio/input/sndBackend.cpp:107
 msgid "copyright"
 msgstr "Copyright"
@@ -530,61 +530,61 @@ msgstr "Copyright"
 msgid "No settings available"
 msgstr "Sin configuración disponible"
 
-#: src/audio/input/gmeBackend.cpp:202
+#: src/audio/input/gmeBackend.cpp:183
 msgid "system"
 msgstr "sistema"
 
-#: src/audio/input/gmeBackend.cpp:203
+#: src/audio/input/gmeBackend.cpp:184
 msgid "game"
 msgstr "juego"
 
-#: src/audio/input/gmeBackend.cpp:204
+#: src/audio/input/gmeBackend.cpp:185
 msgid "dumper"
 msgstr "dumper"
 
-#: src/audio/input/gmeBackend.cpp:280 src/audio/input/hvlBackend.cpp:171
+#: src/audio/input/gmeBackend.cpp:257 src/audio/input/hvlBackend.cpp:171
 msgid "Samplerate"
 msgstr "Frecuencia de muestreo"
 
-#: src/audio/input/gmeBackend.cpp:310
+#: src/audio/input/gmeBackend.cpp:287
 msgid "Equalizer"
 msgstr ""
 
-#: src/audio/input/gmeBackend.cpp:312
+#: src/audio/input/gmeBackend.cpp:289
 msgid "Enable equalizer"
 msgstr ""
 
-#: src/audio/input/gmeBackend.cpp:356
+#: src/audio/input/gmeBackend.cpp:333
 msgid "ASMA path:"
 msgstr "Ruta ASMA:"
 
-#: src/audio/input/gmeBackend.cpp:361 src/audio/input/sidBackend.cpp:781
+#: src/audio/input/gmeBackend.cpp:338 src/audio/input/sidBackend.cpp:781
 #: src/audio/input/sidBackend.cpp:792 src/audio/input/sidBackend.cpp:803
 #: src/audio/input/sidBackend.cpp:814
 msgid "&Browse"
 msgstr ""
 
-#: src/audio/input/gmeBackend.cpp:362 src/audio/input/gmeBackend.cpp:403
+#: src/audio/input/gmeBackend.cpp:339 src/audio/input/gmeBackend.cpp:380
 msgid "Select ASMA directory"
 msgstr "Selecciona el directorio ASMA"
 
-#: src/audio/input/gmeBackend.cpp:415 src/audio/input/sidBackend.cpp:998
+#: src/audio/input/gmeBackend.cpp:392 src/audio/input/sidBackend.cpp:998
 msgid "Warning"
 msgstr "Advertencia"
 
-#: src/audio/input/gmeBackend.cpp:415 src/audio/input/sidBackend.cpp:998
+#: src/audio/input/gmeBackend.cpp:392 src/audio/input/sidBackend.cpp:998
 msgid "Path does not exists"
 msgstr ""
 
 #: src/audio/input/mpcBackend.cpp:157 src/audio/input/ttaBackend.cpp:168
 msgid "publisher"
 msgstr "editor"
 
-#: src/audio/input/mpg123Backend.cpp:423
+#: src/audio/input/mpg123Backend.cpp:473
 msgid "Decoder"
 msgstr "Decodificador"
 
-#: src/audio/input/mpg123Backend.cpp:443
+#: src/audio/input/mpg123Backend.cpp:493
 msgid "Fast scan"
 msgstr ""