Skip to content

Commit

Permalink
Fix for files with subsongs
Browse files Browse the repository at this point in the history 
Fix for files with subsongs. On Older Winamps (2.95) the first song with subsongs was displayed as filename only, on new (5.xxx) the first subson was missing only time.
  • Loading branch information
@zbych-r
zbych-r committed Mar 9, 2018
1 parent 3a99a98 commit 33d9956
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 20 deletions.
Binary file modified in_sidplay2/Release/in_sidplay2.dll
View file
Binary file not shown.
96 changes: 81 additions & 15 deletions in_sidplay2/in_sidplay2.cpp
View file
Expand Up @@ -21,7 +21,20 @@

In_Module inmod;
CThreadSidPlayer *sidPlayer = NULL;
HANDLE gUpdaterThreadHandle = 0;
HANDLE gMutex = 0;

DWORD AddSubsongsThreadProc(void* params);

/** Structure for passing parameters to worker thread for adding subsong
*/
typedef struct tAddSubsongParams
{
int numSubsongs;
int foundIndex;
int startSong;
char fileName[512];
};

void config(HWND hwndParent)
{
Expand Down Expand Up @@ -60,13 +73,21 @@ void init()
sidPlayer = new CThreadSidPlayer(inmod);
sidPlayer->Init();


gMutex = CreateMutex(NULL, FALSE, NULL);


}

void quit() {
/* one-time deinit, such as memory freeing */
if (gMutex != 0)
{
CloseHandle(gMutex);
}
if (gUpdaterThreadHandle != 0)
{
CloseHandle(gUpdaterThreadHandle);
}
if(sidPlayer != NULL)
{
sidPlayer->Stop();
Expand Down Expand Up @@ -322,17 +343,26 @@ void getfileinfo(const char *filename, char *title, int *length_in_ms)
char* foundChar;
bool firstSong = true;

WaitForSingleObject(gMutex, INFINITE);
if (gUpdaterThreadHandle != 0)
{
CloseHandle(gUpdaterThreadHandle);
gUpdaterThreadHandle = 0;
}

if((filename == NULL) || (strlen(filename) == 0))
{
//get current song info
info = sidPlayer->GetTuneInfo();
if (info == NULL)
{
ReleaseMutex(gMutex);
return;
}
length = sidPlayer->GetSongLength();
if (length == -1)
{
ReleaseMutex(gMutex);
return;
}
subsongIndex = info->currentSong();//.currentSong;
Expand Down Expand Up @@ -361,6 +391,7 @@ void getfileinfo(const char *filename, char *title, int *length_in_ms)
info = tune.getInfo();
if (info == NULL)
{
ReleaseMutex(gMutex);
return;
}
subsongIndex = tune.getInfo()->startSong();
Expand All @@ -371,14 +402,18 @@ void getfileinfo(const char *filename, char *title, int *length_in_ms)
length = sidPlayer->GetSongLength(tune);
if (length == -1)
{
ReleaseMutex(gMutex);
return;
}
}

//check if we got correct tune info
//if (info.c64dataLen == 0) return;
if (info->c64dataLen() == 0) return;

if (info->c64dataLen() == 0)
{
ReleaseMutex(gMutex);
return;
}
length *= 1000;
if( length <0) length =0;
if(length_in_ms != NULL) *length_in_ms = length;
Expand Down Expand Up @@ -411,11 +446,15 @@ void getfileinfo(const char *filename, char *title, int *length_in_ms)


//fill STIL data if necessary
const StilBlock* sb;// = NULL;
const StilBlock* sb = NULL;
if (sidPlayer->GetCurrentConfig().useSTILfile == true)
{
sb = sidPlayer->GetSTILData2(strFilename.c_str(), subsongIndex - 1);
}
else
{
sb = NULL;
}
conditionsReplace(titleTemplate, sb, info);

replaceAll(titleTemplate, "%f", fileNameOnly.c_str());
Expand Down Expand Up @@ -454,8 +493,11 @@ void getfileinfo(const char *filename, char *title, int *length_in_ms)
if(title != NULL)
strcpy(title, titleTemplate.c_str());

if((info->songs() == 1)||(firstSong == false)||(filename == NULL)||(strlen(filename) == 0))
if ((info->songs() == 1) || (firstSong == false) || (filename == NULL) || (strlen(filename) == 0))
{
ReleaseMutex(gMutex);
return;
}

//we have subsongs...
plLength = (int)SendMessage(inmod.hMainWindow,WM_WA_IPC,0,IPC_GETLISTLENGTH);
Expand All @@ -468,6 +510,7 @@ void getfileinfo(const char *filename, char *title, int *length_in_ms)
if(strcmp(foundChar+1,filename) == 0)
{
//subtunes were added no point to do it again
ReleaseMutex(gMutex);
return;
}
}
Expand All @@ -485,32 +528,55 @@ void getfileinfo(const char *filename, char *title, int *length_in_ms)
}
}

//run another thread for adding subsongs
tAddSubsongParams *threadParams = new tAddSubsongParams();
threadParams->foundIndex = foundindex;
threadParams->numSubsongs = info->songs();
threadParams->startSong = info->startSong();
strcpy(threadParams->fileName, filename);
gUpdaterThreadHandle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)AddSubsongsThreadProc, (void*)threadParams, 0, NULL);
ReleaseMutex(gMutex);
return;
}

DWORD AddSubsongsThreadProc(void* params)
{
WaitForSingleObject(gMutex, INFINITE);

fileinfo *fi = new fileinfo;
COPYDATASTRUCT *cds = new COPYDATASTRUCT;
std::string strFilename;
char buf[20];
tAddSubsongParams* threadParams = reinterpret_cast<tAddSubsongParams*>(params);
int foundindex = threadParams->foundIndex;
//get HWND of playlist window
h=(HWND)SendMessage(inmod.hMainWindow,WM_WA_IPC,IPC_GETWND_PE,IPC_GETWND);
for(int i=1; i<=info->songs(); ++i )
HWND h = (HWND)SendMessage(inmod.hMainWindow, WM_WA_IPC, IPC_GETWND_PE, IPC_GETWND);
for (int i = 1; i <= threadParams->numSubsongs; ++i)
{
//first entry in playlist will be the startSong that is why we don't add it
if (i == info->startSong())
if (i == threadParams->startSong)
{
continue;
}
++foundindex;
sprintf(buf,"{%d}",i);
sprintf(buf, "{%d}", i);
strFilename.assign(buf);
strFilename.append(filename);
ZeroMemory(fi,sizeof(fileinfo));
strcpy(fi->file , strFilename.c_str());
strFilename.append(threadParams->fileName);
ZeroMemory(fi, sizeof(fileinfo));
strcpy(fi->file, strFilename.c_str());
fi->index = foundindex;
ZeroMemory(cds,sizeof(COPYDATASTRUCT));
ZeroMemory(cds, sizeof(COPYDATASTRUCT));
cds->dwData = IPC_PE_INSERTFILENAME;
cds->lpData = fi;
cds->cbData = sizeof(fileinfo);
SendMessage(h,WM_COPYDATA,0,(LPARAM)cds);
SendMessage(h, WM_COPYDATA, 0, (LPARAM)cds);
}
delete fi;
delete cds;
delete threadParams;

ReleaseMutex(gMutex);
return 0;
}

void eq_set(int on, char data[10], int preamp)
Expand All @@ -527,7 +593,7 @@ void eq_set(int on, char data[10], int preamp)
extern In_Module inmod =
{
IN_VER, // defined in IN2.H
"Winamp SIDPlayer (libsidplayfp) v2.1.3.0"
"Winamp SIDPlayer (libsidplayfp) v2.1.4.0"
// winamp runs on both alpha systems and x86 ones. :)
/*#ifdef __alpha
"(AXP)"
Expand Down
10 changes: 5 additions & 5 deletions in_sidplay2/in_sidplay2.rc
View file
Expand Up @@ -110,7 +110,7 @@ END

IDD_ABOUTDLG DIALOGEX 0, 0, 195, 145
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "in_sidplay2 2.0.1.0"
CAPTION "in_sidplay2 2.1.4.0"
FONT 8, "Microsoft Sans Serif", 700, 0, 0xEE
BEGIN
DEFPUSHBUTTON "OK",IDOK,72,124,50,14
Expand Down Expand Up @@ -220,8 +220,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,1,3,0
PRODUCTVERSION 2,1,3,0
FILEVERSION 2,1,4,0
PRODUCTVERSION 2,1,4,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -238,12 +238,12 @@ BEGIN
BEGIN
VALUE "Comments", "Winamp plugin for SID files"
VALUE "FileDescription", "in_sidplay2 Winamp plugin for SID files"
VALUE "FileVersion", "2.1.3.0"
VALUE "FileVersion", "2.1.4.0"
VALUE "InternalName", "in_sidplay2"
VALUE "LegalCopyright", "Copyright (C) 2016 Zbigniew Ross (Licensed under GNU GPL)"
VALUE "OriginalFilename", "in_sidplay2"
VALUE "ProductName", "in_sidplay2"
VALUE "ProductVersion", "2.1.3.0"
VALUE "ProductVersion", "2.1.4.0"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit 33d9956

Please sign in to comment.