Skip to content

Fix: songs not playing fully/skipping to next before the end #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sle118 wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −3
Open

Fix: songs not playing fully/skipping to next before the end #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e304b88
Fix: songs not playing fully/skipping to next before the end
sle118 Oct 27, 2019
afbf58e
Untangling changes
sle118 Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions socketwrapper/socketwrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,16 @@
// Version 1.11
// Fix to stop socketwrapper not shutting down properly when input from stdin and output pipe is closed.
//
// ++++++
// Version 1.12
// Fix to limit the watchdog on remote stream read. The watchdog will no longer stop the worker thread
// when waiting for LMS to read data.
//

#include <process.h>
#include "stdafx.h"
#include "getopt.h"

#define SW_ID "Socketwrapper 1.11beta\n"
#define SW_ID "Socketwrapper 1.12beta\n"

// defines & global vars for extra thread mode
#define MAX_STEPS 16
Expand All @@ -105,6 +109,7 @@ typedef struct
HANDLE hInput; // input handle for process/thread
HANDLE hOutput; // output handle for process/thread
DWORD WatchDog; // watchdog for worker threads
BOOL bIsWriting; // true when stage thread is writing back to LMS server
DWORD nBlocks; // number of "blocks" read
DWORD nBytes; // number of bytes read
} Stage;
Expand Down Expand Up @@ -212,6 +217,7 @@ unsigned __stdcall MoveDataThreadProc(void *pv)
}

// wait for some data from input
pS->bIsWriting = false;
if( !ReadFile(pS->hInput, pS->pBuff, BUFFER_SIZE, &bytesread, NULL) ) {
stderrMsg ( "MoveDataThreadProc for step %i failed reading with error %i.\n", pS->i, GetLastError() );
break;
Expand All @@ -236,6 +242,7 @@ unsigned __stdcall MoveDataThreadProc(void *pv)
}

// pass data to output
pS->bIsWriting = true;
if (!pS->fOutputIsSocket){
if( !WriteFile(pS->hOutput, pS->pBuff, bytesread, &byteswritten, NULL) ) {
stderrMsg ( "MoveDataThreadProc for step %i failed WriteFile with error %i.\n", pS->i, GetLastError() );
Expand All @@ -261,6 +268,7 @@ unsigned __stdcall MoveDataThreadProc(void *pv)
}


pS->bIsWriting = false;
debugMsg ( "MoveDataThreadProc for step %i ending.\n", pS->i );
if (!pS->fOutputIsSocket) {
if (!FlushFileBuffers(pS->hOutput)) {
Expand Down Expand Up @@ -596,7 +604,7 @@ DWORD main(int argc, char **argv)
fDie = true;
}
for( int i=0; i<numSteps; ++i ){
if( info[i].fIsWorkerThread ){
if (info[i].fIsWorkerThread && (!info[i].bIsWriting || info[i].fOutputIsSocket))
if( 0==info[i].WatchDog ) {
stderrMsg( "Watchdog expired - Thread for step %i stalled.\n", i );
if (bWatchdogEnabled) fDie = true;
Expand Down