[rhythmbox/wip/hadess/cleanups: 28/49] ipod: Require libgpod 0.7.92 from 2010




commit 166d8c1b1a15c658cd8870c010e4b360f54871f2
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Nov 3 11:38:13 2021 +0100

    ipod: Require libgpod 0.7.92 from 2010
    
    I think we can probably bump the requirement...

 config.h.meson            | 4 ----
 meson.build               | 3 +--
 plugins/ipod/rb-ipod-db.c | 4 ----
 3 files changed, 1 insertion(+), 10 deletions(-)
---
diff --git a/config.h.meson b/config.h.meson
index edb57e4a9..1a2fc7448 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -14,10 +14,6 @@
 /* Use GUdev for hardware detection */
 #mesondefine HAVE_GUDEV
 
-/* Indicates whether libgpod is new enough to have its itdb_start/stop_sync
-   API */
-#mesondefine HAVE_ITDB_START_STOP_SYNC
-
 /* Have libbrasero-media */
 #mesondefine HAVE_LIBBRASERO_MEDIA
 
diff --git a/meson.build b/meson.build
index 2cce2eabf..7ca0f97b1 100644
--- a/meson.build
+++ b/meson.build
@@ -73,10 +73,9 @@ endif
 
 use_ipod = false
 if get_option('ipod').allowed()
-  libgpod = dependency('libgpod-1.0', version: '>= 0.6', required: get_option('ipod'))
+  libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod'))
   if libgpod.found()
     use_ipod = true
-    cdata.set('HAVE_ITDB_START_STOP_SYNC', libgpod.version() >= '0.7.92')
   endif
 endif
 
diff --git a/plugins/ipod/rb-ipod-db.c b/plugins/ipod/rb-ipod-db.c
index 049b82583..725393093 100644
--- a/plugins/ipod/rb-ipod-db.c
+++ b/plugins/ipod/rb-ipod-db.c
@@ -142,9 +142,7 @@ rb_itdb_save (RbIpodDb *ipod_db, GError **error)
        if (priv->needs_shuffle_db) {
                itdb_shuffle_write (priv->itdb, error);
        }
-#ifdef HAVE_ITDB_START_STOP_SYNC
        itdb_stop_sync (priv->itdb);
-#endif
 }
 
 static void
@@ -899,9 +897,7 @@ rb_ipod_db_save_async (RbIpodDb *ipod_db)
        RbIpodDbPrivate *priv = IPOD_DB_GET_PRIVATE (ipod_db);
 
        if (priv->save_timeout_id == 0) {
-#ifdef HAVE_ITDB_START_STOP_SYNC
                itdb_start_sync (priv->itdb);
-#endif
                rb_debug ("Scheduling iPod database save in 2 seconds");
        } else {
                g_source_remove (priv->save_timeout_id);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]