Depend on Gtk3 >= 3.4 and Glib >= 2.32 and ignore deprecations since …

…Gtk 3.10

First commit to port to GtkApplication.
Depend on libcdio_paranoia >= 0.90, so fix issue #46

configure.ac

@@ -20,6 +20,10 @@ dnl  Initialize automake
 AM_INIT_AUTOMAKE([no-dist-gzip dist-bzip2])
 AM_MAINTAINER_MODE()
 
+dnl Set required and max glib/gdk versions
+AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_4, [Ignore post 3.10 deprecations])
+AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_10, [Ignore post 3.10 deprecations])
+
 dnl *********************
 dnl * Debugging support *
 dnl *********************
@@ -77,11 +81,11 @@ GSTREAMER_REQUIRED=0.11.90
 dnl Check for required packages
 XDT_CHECK_PACKAGE([GSTREAMER], [gstreamer-1.0], [$GSTREAMER_REQUIRED])
 XDT_CHECK_PACKAGE([GSTREAMER_BASE], [gstreamer-base-1.0], [$GSTREAMER_REQUIRED])
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.28])
-XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.32])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.4.0])
 XDT_CHECK_PACKAGE([SQLITE3], [sqlite3], [3.4])
 XDT_CHECK_PACKAGE([LIBCDIO], [libcdio], [0.80])
-XDT_CHECK_PACKAGE([LIBCDIO_PARANOIA], [libcdio_paranoia], [0.80])
+XDT_CHECK_PACKAGE([LIBCDIO_PARANOIA], [libcdio_paranoia], [0.90])
 XDT_CHECK_PACKAGE([LIBCDDB], [libcddb], [1.3.0])
 XDT_CHECK_PACKAGE([TAGLIB_C], [taglib_c], [1.4])
 
@@ -139,10 +143,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBMTP],
                            [libmtp library], [yes])
 fi
 
-dnl Test for new paranoia headers location
-AC_CHECK_HEADER(cdio/paranoia/cdda.h, [
-	AC_DEFINE(HAVE_PARANOIA_NEW_INCLUDES, 1, [Define to 1 if cdio/paranoia/paranoia.h is present]) ])
-
 dnl Check min taglib to add monkeyaudio support
 TAGLIB_1_7_FOUND="no"
 XDT_CHECK_OPTIONAL_PACKAGE([TAGLIB_1_7],

plugins/devices/pragha-devices-cd.c

@@ -28,6 +28,7 @@
 #include <gudev/gudev.h>
 #include <stdlib.h>
 
+#include "src/pragha-cdda.h"
 #include "src/pragha-file-utils.h"
 #include "src/pragha-utils.h"
 #include "src/pragha-debug.h"
@@ -45,7 +46,7 @@ pragha_devices_audio_cd_added (PraghaDevicesPlugin *plugin)
 	switch (response)
 	{
 		case PRAGHA_DEVICE_RESPONSE_PLAY:
-			add_audio_cd (pragha_device_get_application(plugin));
+			pragha_application_append_audio_cd (pragha_device_get_application(plugin));
 			break;
 		case PRAGHA_DEVICE_RESPONSE_NONE:
 		default:

src/pragha-cdda.c

@@ -16,6 +16,7 @@
 /* along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 /*************************************************************************/
 
+#include "pragha-cdda.h"
 #include "pragha-utils.h"
 #include "pragha-musicobject-mgmt.h"
 #include "pragha.h"
@@ -115,7 +116,7 @@ static cdrom_drive_t* find_audio_cd(PraghaApplication *pragha)
 	return drive;
 }
 
-void add_audio_cd(PraghaApplication *pragha)
+void pragha_application_append_audio_cd (PraghaApplication *pragha)
 {
 	lba_t lba;
 	gint matches;

src/pragha-cdda.h

@@ -19,23 +19,20 @@
 #ifndef CDDA_H
 #define CDDA_H
 
-#include <glib.h>
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-/* pragha.h */
-typedef struct _PraghaApplication PraghaApplication;
+#include <glib.h>
 
-#ifdef HAVE_PARANOIA_NEW_INCLUDES
-   #include <cdio/paranoia/cdda.h>
-#else
-   #include <cdio/cdda.h>
-   #ifdef __CDIO_CONFIG_H__
-      #include <cdio/cdio_unconfig.h>
-   #endif
-#endif
+#include <cdio/paranoia/cdda.h>
 #include <cdio/cd_types.h>
 #include <cddb/cddb.h>
 
-void add_audio_cd (PraghaApplication *pragha);
+/* pragha.h */
+typedef struct _PraghaApplication PraghaApplication;
+
+void pragha_application_append_audio_cd (PraghaApplication *pragha);
 
 void pragha_cdda_free ();
 

src/pragha-file-utils.c

@@ -16,6 +16,10 @@
 /* along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 /*************************************************************************/
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 

src/pragha-menubar.c

@@ -28,6 +28,7 @@
 
 #include <gdk/gdkkeysyms.h>
 #include "pragha-menubar.h"
+#include "pragha-cdda.h"
 #include "pragha-playback.h"
 #include "pragha-file-utils.h"
 #include "pragha-utils.h"
@@ -519,7 +520,7 @@ void open_file_action(GtkAction *action, PraghaApplication *pragha)
 
 void add_audio_cd_action(GtkAction *action, PraghaApplication *pragha)
 {
-	add_audio_cd(pragha);
+	pragha_application_append_audio_cd (pragha);
 }
 
 /* Build a dialog to get a new playlist name */

src/pragha-playback.c

@@ -15,6 +15,10 @@
 /* along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 /*************************************************************************/
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "pragha-playback.h"
 #include "pragha-menubar.h"
 #include "pragha-file-utils.h"

src/pragha.h

@@ -19,10 +19,6 @@
 #ifndef PRAGHA_H
 #define PRAGHA_H
 
-#ifndef HAVE_PARANOIA_NEW_INCLUDES
-#include "pragha-cdda.h" // Should be before config.h, libcdio 0.83 issue
-#endif
-
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -50,11 +46,6 @@
 #include "pragha-window.h"
 #include "pragha-debug.h"
 
-/* With libcio 0.83 should be before config.h. libcdio issue */
-#ifdef HAVE_PARANOIA_NEW_INCLUDES
-#include "pragha-cdda.h"
-#endif
-
 /* Some default preferences. */
 
 #define MIN_WINDOW_WIDTH           (gdk_screen_width() * 3 / 4)