gtkpod-cvs2

[gtpd-cvs] SF.net SVN: gtkpod:[2379] gtkpod/trunk

[<pha...@us...>]

Revision: 2379
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2379&view=rev
Author:   phantom_sf
Date:     2009-08-07 20:49:30 +0000 (Fri, 07 Aug 2009)

Log Message:
-----------
2009-08-07 Paul Richardson <phantom_sf at users.sourceforge.net>

        * src/files_itunes.db
          Patch because iphones with os 3.0 only have an iTunesCDB
          file and no iTunesDB file. Thanks to teuf for patch

Modified Paths:
--------------
    gtkpod/trunk/ChangeLog
    gtkpod/trunk/src/file_itunesdb.c

Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog	2009-08-02 16:42:18 UTC (rev 2378)
+++ gtkpod/trunk/ChangeLog	2009-08-07 20:49:30 UTC (rev 2379)
@@ -1,3 +1,9 @@
+2009-08-07 Paul Richardson <phantom_sf at users.sourceforge.net>
+
+	* src/files_itunes.db
+	  Patch because iphones with os 3.0 only have an iTunesCDB
+	  file and no iTunesDB file. Thanks to teuf for patch
+
 2009-08-02 Paul Richardson <phantom_sf at users.sourceforge.net>
 
 	* syncdir.c (sync_playlist):

Modified: gtkpod/trunk/src/file_itunesdb.c
===================================================================
--- gtkpod/trunk/src/file_itunesdb.c	2009-08-02 16:42:18 UTC (rev 2378)
+++ gtkpod/trunk/src/file_itunesdb.c	2009-08-07 20:49:30 UTC (rev 2379)
@@ -524,14 +524,11 @@
     { /* GP_ITDB_TYPE_IPOD _and_ iPod is connected */
 	gchar *name_ext=NULL, *name_db=NULL;
 
-	gchar *itunes_dir = itdb_get_itunes_dir (mp);
-	if (itunes_dir)
-	{
-	    name_ext = itdb_get_path (itunes_dir, "iTunesDB.ext");
-	    name_db  = itdb_get_path (itunes_dir, "iTunesDB");
-	}
+	name_db = itdb_get_itunesdb_path (mp);
 	if (name_db)
 	{
+	    name_ext = g_strdup_printf("%s.ext", name_db);
+
 	    if (WRITE_EXTENDED_INFO)
 	    {
 		if (!read_extended_info (name_ext, name_db))
@@ -571,7 +568,6 @@
 	}
 	g_free (name_ext);
 	g_free (name_db);
-	g_free (itunes_dir);
     }
     g_free (cfgdir);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gtpd-cvs] SF.net SVN: gtkpod:[2380] gtkpod/trunk

[<tmz...@us...>]

Revision: 2380
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2380&view=rev
Author:   tmzullinger
Date:     2009-08-14 15:53:36 +0000 (Fri, 14 Aug 2009)

Log Message:
-----------
file_convert: Fix missing variable in warning

The conv-cachedir variable was missing from a gtkpod_warning() call,
leaving users wondering what "Could not create '%s'." might mean.

Modified Paths:
--------------
    gtkpod/trunk/ChangeLog
    gtkpod/trunk/src/file_convert.c

Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog	2009-08-07 20:49:30 UTC (rev 2379)
+++ gtkpod/trunk/ChangeLog	2009-08-14 15:53:36 UTC (rev 2380)
@@ -1,3 +1,11 @@
+2009-08-14  Todd Zullinger  <tm...@po...>
+
+	* src/file_convert.c: Fix missing variable in warning
+
+	  The conv-cachedir variable was missing from a
+	  gtkpod_warning() call, leaving users wondering what "Could
+	  not create '%s'." might mean.
+
 2009-08-07 Paul Richardson <phantom_sf at users.sourceforge.net>
 
 	* src/files_itunes.db

Modified: gtkpod/trunk/src/file_convert.c
===================================================================
--- gtkpod/trunk/src/file_convert.c	2009-08-07 20:49:30 UTC (rev 2379)
+++ gtkpod/trunk/src/file_convert.c	2009-08-14 15:53:36 UTC (rev 2380)
@@ -1348,7 +1348,8 @@
 	{
 	    if ((g_mkdir (conv->cachedir, 0777)) == -1)
 	    {
-		gtkpod_warning (_("Could not create '%s'. Filetype conversion will not work.\n"));
+		gtkpod_warning (_("Could not create '%s'. Filetype conversion will not work.\n"),
+				  conv->cachedir);
 		g_free (conv->cachedir);
 		conv->cachedir = NULL;
 	    }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gtpd-cvs] SF.net SVN: gtkpod:[2384] gtkpod/trunk

[<pha...@us...>]

Revision: 2384
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2384&view=rev
Author:   phantom_sf
Date:     2009-09-03 21:35:10 +0000 (Thu, 03 Sep 2009)

Log Message:
-----------
2009-09-03 Paul Richardson <phantom_sf at users.sourceforge.net>

        * src/misc_track.c: Fix podcast addition

          Patch to make a podcast added to the podcast playlist
          recognised as a podcast on the ipod. Thanks to
          Adam Sj?\195?\184gren for the patch.

Modified Paths:
--------------
    gtkpod/trunk/ChangeLog
    gtkpod/trunk/src/misc_track.c

Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog	2009-09-03 21:34:24 UTC (rev 2383)
+++ gtkpod/trunk/ChangeLog	2009-09-03 21:35:10 UTC (rev 2384)
@@ -1,3 +1,11 @@
+2009-09-03 Paul Richardson <phantom_sf at users.sourceforge.net>
+
+        * src/misc_track.c: Fix podcast addition
+
+	  Patch to make a podcast added to the podcast playlist
+	  recognised as a podcast on the ipod. Thanks to
+	  Adam Sjøgren for the patch.
+
 2009-08-14  Todd Zullinger  <tm...@po...>
 
 	* src/file_convert.c: Fix missing variable in warning

Modified: gtkpod/trunk/src/misc_track.c
===================================================================
--- gtkpod/trunk/src/misc_track.c	2009-09-03 21:34:24 UTC (rev 2383)
+++ gtkpod/trunk/src/misc_track.c	2009-09-03 21:35:10 UTC (rev 2384)
@@ -2147,7 +2147,6 @@
     track->remember_playback_position = 0x01;  /* remember playback
 						* position */
     track->flag4 = 0x01;  /* Show Title/Album on the 'Now Playing' page */
-    track->mediatype = ITDB_MEDIATYPE_PODCAST; /* show up under Podcasts */
 }
 
 /* set podcast-specific flags for @track */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.