Browse files

The iTunes plug-in should now run on Windows XP. We now just try agai…

…n when the database is locked (like we do for busy).
  • Loading branch information...
1 parent 4e5151b commit 464b591ea273ce6949dfd007ae77c7b60695cee5 @eartle eartle committed Jan 23, 2013
View
2 admin/dist/win/Last.fm.iss
@@ -132,7 +132,7 @@ Source: "..\..\..\_bin\plugins\misc\liblogger_plugin.dll"; DestDir: "{app}\plugi
;media player plugin installers
Source: "..\..\..\_bin\plugins\FooPlugin0.9.4Setup_2.3.1.3.exe"; DestDir: "{app}\plugins"; Flags: ignoreversion
-Source: "..\..\..\_bin\plugins\iTunesPluginWinSetup_5.0.5.3.exe"; DestDir: "{app}\plugins"; Flags: ignoreversion
+Source: "..\..\..\_bin\plugins\iTunesPluginWinSetup_5.0.5.4.exe"; DestDir: "{app}\plugins"; Flags: ignoreversion
Source: "..\..\..\_bin\plugins\WinampPluginSetup_2.1.0.11.exe"; DestDir: "{app}\plugins"; Flags: ignoreversion
Source: "..\..\..\_bin\plugins\WmpPluginSetup_2.1.0.7.exe"; DestDir: "{app}\plugins"; Flags: ignoreversion
View
4 app/client/Plugins/ITunesPluginInfo.cpp
@@ -10,7 +10,7 @@ ITunesPluginInfo::ITunesPluginInfo( QObject* parent )
Version
ITunesPluginInfo::version() const
{
- return Version( 5, 0, 5, 3 );
+ return Version( 5, 0, 5, 4 );
}
QString
@@ -56,6 +56,6 @@ ITunesPluginInfo::bootstrapType() const
QString
ITunesPluginInfo::pluginInstaller() const
{
- return "iTunesPluginWinSetup_5.0.5.3.exe";
+ return "iTunesPluginWinSetup_5.0.5.4.exe";
}
View
2 common/c++/win/scrobSubPipeName.cpp
@@ -24,8 +24,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define _WIN32_WINNT 0x0500
-
#include "windows.h"
#include "Sddl.h" // for ConvertSidToString (_WIN32_WINNT = 0x0500)
#include <string>
View
10 plugins/iTunes/ITunesPlaysDatabase.cpp
@@ -106,7 +106,7 @@ static void unlock_notify_cb(void **apArg, int nArg)
UnlockNotification *p = (UnlockNotification *)apArg[i];
EnterCriticalSection( &p->mutex );
p->fired = 1;
- WakeConditionVariable ( &p->cond );
+ //WakeConditionVariable( &p->cond );
LeaveCriticalSection( &p->mutex );
}
}
@@ -132,7 +132,7 @@ static int wait_for_unlock_notify(sqlite3 *db){
/* Initialize the UnlockNotification structure. */
un.fired = 0;
InitializeCriticalSection( &un.mutex );
- InitializeConditionVariable( &un.cond );
+ //InitializeConditionVariable( &un.cond );
/* Register for an unlock-notify callback. */
rc = sqlite3_unlock_notify( db, unlock_notify_cb, (void *)&un );
@@ -153,7 +153,7 @@ static int wait_for_unlock_notify(sqlite3 *db){
if( !un.fired )
{
- SleepConditionVariableCS( &un.cond, &un.mutex, INFINITE );
+ //SleepConditionVariableCS( &un.cond, &un.mutex, INFINITE );
}
LeaveCriticalSection( &un.mutex );
@@ -292,7 +292,9 @@ ITunesPlaysDatabase::query( /* utf-8 */ const char* statement, std::string* resu
case SQLITE_LOCKED:
LOG( 3, "Database locked. Waiting for unlock." );
- wait_for_unlock_notify( m_db );
+ busyCount++;
+ sqlite3_sleep( 25 );
+ //wait_for_unlock_notify( m_db );
break;
default:
View
8 plugins/iTunes/_iTunes.iss
@@ -2,13 +2,13 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
[CustomMessages]
-Version=5.0.5.3
+Version=5.0.5.4
[Setup]
-OutputBaseFilename=iTunesPluginWinSetup_5.0.5.3
+OutputBaseFilename=iTunesPluginWinSetup_5.0.5.4
; setup.exe version
-VersionInfoVersion=5.0.5.3
-VersionInfoTextVersion=5.0.5.3
+VersionInfoVersion=5.0.5.4
+VersionInfoTextVersion=5.0.5.4
AppName=Last.fm iTunes Plugin
AppVerName=Last.fm iTunes Plugin {cm:Version}
VersionInfoDescription=Last.fm iTunes Plugin Installer
View
2 plugins/iTunes/_iTunes.plist
@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>hook</string>
<key>CFBundleVersion</key>
- <string>5.0.5.3</string>
+ <string>5.0.5.4</string>
<key>CFBundleShortVersionString</key>
<string>5.0.5</string>
</dict>
View
8 plugins/iTunes/_iTunes.rc
@@ -65,8 +65,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,5,3
- PRODUCTVERSION 5,0,5,3
+ FILEVERSION 5,0,5,4
+ PRODUCTVERSION 5,0,5,4
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -84,12 +84,12 @@ BEGIN
VALUE "Comments", "http://www.last.fm"
VALUE "CompanyName", "Last.fm"
VALUE "FileDescription", "Last.fm iTunes plugin"
- VALUE "FileVersion", "5, 0, 5, 3"
+ VALUE "FileVersion", "5, 0, 5, 4"
VALUE "InternalName", "itw_scrobbler"
VALUE "LegalCopyright", "Copyright (C) 2008"
VALUE "OriginalFilename", "itw_scrobbler.dll"
VALUE "ProductName", "Last.fm iTunes plugin"
- VALUE "ProductVersion", "5, 0, 5, 3"
+ VALUE "ProductVersion", "5, 0, 5, 4"
END
END
BLOCK "VarFileInfo"
View
11 plugins/iTunes/_iTunes.sln
@@ -1,11 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iTunes Scrobbler", "_iTunes.vcproj", "{50EF2156-958A-4184-B34E-77D7BA2422F5}"
- ProjectSection(ProjectDependencies) = postProject
- {6530D504-E2F9-4073-9E42-3138A6085BFA} = {6530D504-E2F9-4073-9E42-3138A6085BFA}
- EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iTunes Scrobbler", "_iTunes.vcxproj", "{50EF2156-958A-4184-B34E-77D7BA2422F5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ScrobSub", "..\scrobsub\ScrobSub.vcproj", "{6530D504-E2F9-4073-9E42-3138A6085BFA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ScrobSub", "..\scrobsub\ScrobSub.vcxproj", "{6530D504-E2F9-4073-9E42-3138A6085BFA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
View
2 plugins/iTunes/main.h
@@ -43,7 +43,7 @@
#define kTVisualPluginMajorVersion 5
#define kTVisualPluginMinorVersion 0
#define kTVisualPluginReleaseStage 5
-#define kTVisualPluginNonFinalRelease 3
+#define kTVisualPluginNonFinalRelease 4
struct VisualPluginData;

0 comments on commit 464b591

Please sign in to comment.