2012-03-23 09:28:25 -04:00
|
|
|
$OpenBSD: patch-src_mediadevices_ipod_IpodDevice_cpp,v 1.3 2012/03/23 13:28:25 ajacoutot Exp $
|
|
|
|
|
|
|
|
error: #error "Only <glib.h> can be included directly."
|
|
|
|
|
|
|
|
--- src/mediadevices/ipod/IpodDevice.cpp.orig Fri Mar 23 13:02:31 2012
|
|
|
|
+++ src/mediadevices/ipod/IpodDevice.cpp Fri Mar 23 13:02:49 2012
|
|
|
|
@@ -24,18 +24,17 @@
|
2011-10-18 08:17:26 -04:00
|
|
|
|
|
|
|
#include "logger.h"
|
|
|
|
|
|
|
|
-#include <QApplication>
|
|
|
|
#include <QDateTime>
|
|
|
|
+#include <QFileInfo>
|
|
|
|
#include <QSqlError>
|
|
|
|
#include <QSqlQuery>
|
|
|
|
#include <QtPlugin>
|
|
|
|
-#include <QFileDialog>
|
|
|
|
#include <QSettings>
|
|
|
|
|
|
|
|
extern "C"
|
2012-03-23 09:28:25 -04:00
|
|
|
{
|
|
|
|
#include <gpod/itdb.h>
|
|
|
|
- #include <glib/glist.h>
|
|
|
|
+ #include <glib.h>
|
|
|
|
}
|
|
|
|
|
|
|
|
#define TABLE_NAME "IpodDeviceTracks"
|
2011-10-18 08:17:26 -04:00
|
|
|
@@ -78,8 +77,9 @@ IpodDevice::open()
|
2011-09-19 08:50:57 -04:00
|
|
|
|
|
|
|
if ( m_uid.isEmpty() )
|
|
|
|
{
|
|
|
|
- QFileInfo f( m_mountPath + "/iPod_Control/Device" );
|
|
|
|
- m_uid = f.created().toString( "yyMMdd_hhmmss" );
|
|
|
|
+ //QFileInfo f( m_mountPath + "/iPod_Control/Device" );
|
|
|
|
+ //m_uid = f.created().toString( "yyMMdd_hhmmss" );
|
|
|
|
+ m_uid = itdb_device_get_sysinfo( m_itdb->device, "FirewireGuid" );
|
|
|
|
|
|
|
|
qDebug() << "uid" << m_uid;
|
|
|
|
}
|