diff --git a/.gitignore b/.gitignore index dcd28b7..ecd41d5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ Release/src .gradle .settings build +/cpp/pipe/Release/src diff --git a/cpp/pipe/Debug/copy.bat b/cpp/pipe/Debug/copy.bat index 29660ad..2f38e77 100644 --- a/cpp/pipe/Debug/copy.bat +++ b/cpp/pipe/Debug/copy.bat @@ -1 +1 @@ -copy pipe.dll ..\..\..\java\pipe.dll \ No newline at end of file +copy pipe.dll ..\..\..\java\sound\pipe.dll \ No newline at end of file diff --git a/cpp/pipe/Debug/pipe.dll b/cpp/pipe/Debug/pipe.dll index b736d52..8a948e6 100644 Binary files a/cpp/pipe/Debug/pipe.dll and b/cpp/pipe/Debug/pipe.dll differ diff --git a/cpp/pipe/Release/copy.bat b/cpp/pipe/Release/copy.bat index 29660ad..2f38e77 100644 --- a/cpp/pipe/Release/copy.bat +++ b/cpp/pipe/Release/copy.bat @@ -1 +1 @@ -copy pipe.dll ..\..\..\java\pipe.dll \ No newline at end of file +copy pipe.dll ..\..\..\java\sound\pipe.dll \ No newline at end of file diff --git a/cpp/pipe/Release/pipe.dll b/cpp/pipe/Release/pipe.dll index f0ee87e..c698219 100644 Binary files a/cpp/pipe/Release/pipe.dll and b/cpp/pipe/Release/pipe.dll differ diff --git a/cpp/pipe/Release/src/pipe.o b/cpp/pipe/Release/src/pipe.o deleted file mode 100644 index 6f2ae85..0000000 Binary files a/cpp/pipe/Release/src/pipe.o and /dev/null differ diff --git a/cpp/pipe/src/pipe.c b/cpp/pipe/src/pipe.c index bc6221a..1a35caa 100644 --- a/cpp/pipe/src/pipe.c +++ b/cpp/pipe/src/pipe.c @@ -5,28 +5,17 @@ #define DEBUG 0 -JNIEXPORT jint JNICALL Java_pipe_Pipe_CreateNamedPipe -( - JNIEnv *env, - jclass className, - jstring sPipeName, - jint dwOpenMode, - jint dwPipeMode, - jint nMaxInstances, - jint nOutBufferSize, - jint nInBufferSize, - jint nDefaultTimeOut, - jint lpSecurityAttributes - ) -{ +JNIEXPORT jint JNICALL Java_pipe_Pipe_CreateNamedPipe(JNIEnv *env, + jclass className, jstring sPipeName, jint dwOpenMode, jint dwPipeMode, + jint nMaxInstances, jint nOutBufferSize, jint nInBufferSize, + jint nDefaultTimeOut, jint lpSecurityAttributes) { HANDLE pipeHandler; LPCSTR pipeName; - pipeName = (*env)->GetStringUTFChars(env, sPipeName, NULL); - if (pipeName == NULL) + pipeName = (*env)->GetStringUTFChars(env, sPipeName, NULL ); + if (pipeName == NULL ) return -1; - if (DEBUG) - { + if (DEBUG) { printf("Native: Pipe Name %s\n", pipeName); printf("Native: dwOpenMode %d\n", dwOpenMode); printf("Native: dwPipeMode %d\n", dwPipeMode); @@ -36,225 +25,166 @@ JNIEXPORT jint JNICALL Java_pipe_Pipe_CreateNamedPipe printf("Native: nDefaultTimeOut %d\n", nDefaultTimeOut); } - pipeHandler = CreateNamedPipe((LPCSTR)pipeName, dwOpenMode, dwPipeMode, nMaxInstances, nOutBufferSize, nInBufferSize, - nDefaultTimeOut, (LPSECURITY_ATTRIBUTES) lpSecurityAttributes); + pipeHandler = CreateNamedPipe((LPCSTR) pipeName, dwOpenMode, dwPipeMode, + nMaxInstances, nOutBufferSize, nInBufferSize, nDefaultTimeOut, + (LPSECURITY_ATTRIBUTES) lpSecurityAttributes); (*env)->ReleaseStringUTFChars(env, sPipeName, pipeName); return (jint) pipeHandler; } -JNIEXPORT jboolean JNICALL Java_pipe_Pipe_ConnectNamedPipe -( - JNIEnv *env, - jclass className, - jint hNamedPipe, - jint lpOverlapped - ) -{ +JNIEXPORT jboolean JNICALL Java_pipe_Pipe_ConnectNamedPipe(JNIEnv *env, + jclass className, jint hNamedPipe, jint lpOverlapped) { BOOL fConnected; HANDLE pipeHandler = (HANDLE) hNamedPipe; fConnected = ConnectNamedPipe(pipeHandler, (LPOVERLAPPED) lpOverlapped); return fConnected; } -JNIEXPORT jint JNICALL Java_pipe_Pipe_GetLastError -( - JNIEnv *env, - jclass className - ) -{ +JNIEXPORT jint JNICALL Java_pipe_Pipe_GetLastError(JNIEnv *env, + jclass className) { DWORD errorNumber = GetLastError(); return (jint) errorNumber; } -JNIEXPORT jboolean JNICALL Java_pipe_Pipe_CloseHandle -( - JNIEnv *env, - jclass className, - jint hNamedPipe - ) -{ +JNIEXPORT jboolean JNICALL Java_pipe_Pipe_CloseHandle(JNIEnv *env, + jclass className, jint hNamedPipe) { BOOL result; - HANDLE pipeHandler = (HANDLE) hNamedPipe; + HANDLE pipeHandler = (HANDLE) hNamedPipe; result = CloseHandle(pipeHandler); return result; } -JNIEXPORT jbyteArray JNICALL Java_pipe_Pipe_ReadFile -( - JNIEnv *env, - jclass className, - jint hNamedPipe, - jint nNumberOfBytesToRead - ) -{ +JNIEXPORT jbyteArray JNICALL Java_pipe_Pipe_ReadFile(JNIEnv *env, + jclass className, jint hNamedPipe, jint nNumberOfBytesToRead) { int bytesRead = 0; BOOL result; - HANDLE pipeHandler = (HANDLE) hNamedPipe; + HANDLE pipeHandler = (HANDLE) hNamedPipe; LPVOID buffer; jbyteArray lpBuffer; - buffer = (LPVOID)LocalAlloc(LMEM_ZEROINIT, nNumberOfBytesToRead); + buffer = (LPVOID) LocalAlloc(LMEM_ZEROINIT, nNumberOfBytesToRead); - if (DEBUG) - { - printf("Native: Before ReadFile pipeHandler %d nNumberOfBytesToRead %d\n", pipeHandler, nNumberOfBytesToRead); + if (DEBUG) { + printf( + "Native: Before ReadFile pipeHandler %d nNumberOfBytesToRead %d\n", + pipeHandler, nNumberOfBytesToRead); } - result = ReadFile(pipeHandler, (LPVOID) buffer, (DWORD) nNumberOfBytesToRead, &bytesRead, (LPOVERLAPPED) 0); - if (result) - { + result = ReadFile(pipeHandler, (LPVOID) buffer, + (DWORD) nNumberOfBytesToRead, &bytesRead, (LPOVERLAPPED) 0); + if (result) { lpBuffer = (*env)->NewByteArray(env, (jsize) bytesRead); - (*env)->SetByteArrayRegion(env, lpBuffer, 0, (jsize) bytesRead, (jbyte *) buffer); + (*env)->SetByteArrayRegion(env, lpBuffer, 0, (jsize) bytesRead, + (jbyte *) buffer); } else bytesRead = 0; LocalFree(buffer); - if (DEBUG) - { + if (DEBUG) { printf("Native: After ReadFile BytesRead %d\n", bytesRead); } return lpBuffer; } -JNIEXPORT jint JNICALL Java_pipe_Pipe_WriteFile -( - JNIEnv *env, - jclass className, - jint hNamedPipe, - jbyteArray lpBuffer, - jint nNumberOfBytesToWrite - ) -{ +JNIEXPORT jint JNICALL Java_pipe_Pipe_WriteFile(JNIEnv *env, jclass className, + jint hNamedPipe, jbyteArray lpBuffer, jint nNumberOfBytesToWrite) { int bytesWritten = 0; BOOL result; - HANDLE pipeHandler = (HANDLE) hNamedPipe; + HANDLE pipeHandler = (HANDLE) hNamedPipe; LPVOID buffer; - buffer = (LPVOID)LocalAlloc(LMEM_ZEROINIT, nNumberOfBytesToWrite); + buffer = (LPVOID) LocalAlloc(LMEM_ZEROINIT, nNumberOfBytesToWrite); (*env)->GetByteArrayRegion(env, lpBuffer, 0, nNumberOfBytesToWrite, buffer); - result = WriteFile(pipeHandler, buffer, (DWORD) nNumberOfBytesToWrite, (LPDWORD) &bytesWritten, (LPOVERLAPPED) 0); + result = WriteFile(pipeHandler, buffer, (DWORD) nNumberOfBytesToWrite, + (LPDWORD) &bytesWritten, (LPOVERLAPPED) 0); LocalFree(buffer); - if (DEBUG) - { + if (DEBUG) { printf("Native: After WriteFile BytesReadWritten %d\n", bytesWritten); } - if (!result) - { + if (!result) { if (GetLastError() != ERROR_IO_PENDING) result = 0; else result = 1; } - if (!result) - { + if (!result) { bytesWritten = -1; } return bytesWritten; } -JNIEXPORT jboolean JNICALL Java_pipe_Pipe_FlushFileBuffers -( - JNIEnv *env, - jclass className, - jint hNamedPipe - ) -{ +JNIEXPORT jboolean JNICALL Java_pipe_Pipe_FlushFileBuffers(JNIEnv *env, + jclass className, jint hNamedPipe) { BOOL result; - HANDLE pipeHandler = (HANDLE) hNamedPipe; + HANDLE pipeHandler = (HANDLE) hNamedPipe; result = FlushFileBuffers(pipeHandler); return result; } -JNIEXPORT jboolean JNICALL Java_pipe_Pipe_DisconnectNamedPipe -( - JNIEnv *env, - jclass className, - jint hNamedPipe - ) -{ +JNIEXPORT jboolean JNICALL Java_pipe_Pipe_DisconnectNamedPipe(JNIEnv *env, + jclass className, jint hNamedPipe) { BOOL result; - HANDLE pipeHandler = (HANDLE) hNamedPipe; + HANDLE pipeHandler = (HANDLE) hNamedPipe; result = DisconnectNamedPipe(pipeHandler); return result; } -JNIEXPORT jint JNICALL Java_pipe_Pipe_CreateFile -( - JNIEnv *env, - jclass className, - jstring lpFileName, - jint dwDesiredAccess, - jint dwShareMode, - jint lpSecurityAttributes, - jint dwCreationDisposition, - jint dwFlagsAndAttributes, - jint hTemplateFile - ) -{ - HANDLE pipeHandler; +JNIEXPORT jint JNICALL Java_pipe_Pipe_CreateFile(JNIEnv *env, jclass className, + jstring lpFileName, jint dwDesiredAccess, jint dwShareMode, + jint lpSecurityAttributes, jint dwCreationDisposition, + jint dwFlagsAndAttributes, jint hTemplateFile) { + HANDLE pipeHandler; const jbyte *fileName; - fileName = (*env)->GetStringUTFChars(env, lpFileName, NULL); - if (fileName == NULL) + fileName = (*env)->GetStringUTFChars(env, lpFileName, NULL ); + if (fileName == NULL ) return -1; - pipeHandler = CreateFile((LPCSTR) fileName, (DWORD) dwDesiredAccess, (DWORD) dwShareMode, - (LPSECURITY_ATTRIBUTES) lpSecurityAttributes, (DWORD) dwCreationDisposition, (DWORD) dwFlagsAndAttributes, (HANDLE) hTemplateFile); + pipeHandler = CreateFile((LPCSTR) fileName, (DWORD) dwDesiredAccess, + (DWORD) dwShareMode, (LPSECURITY_ATTRIBUTES) lpSecurityAttributes, + (DWORD) dwCreationDisposition, (DWORD) dwFlagsAndAttributes, + (HANDLE) hTemplateFile); return (jint) pipeHandler; } -JNIEXPORT jboolean JNICALL Java_pipe_Pipe_WaitNamedPipe -( - JNIEnv *env, - jclass className, - jstring lpNamedPipeName, - jint nTimeOut - ) -{ +JNIEXPORT jboolean JNICALL Java_pipe_Pipe_WaitNamedPipe(JNIEnv *env, + jclass className, jstring lpNamedPipeName, jint nTimeOut) { BOOL result; const jbyte *pipeName; - pipeName = (*env)->GetStringUTFChars(env, lpNamedPipeName, NULL); - if (pipeName == NULL) + pipeName = (*env)->GetStringUTFChars(env, lpNamedPipeName, NULL ); + if (pipeName == NULL ) return 0; result = WaitNamedPipe((LPCSTR) pipeName, (DWORD) nTimeOut); return result; } -JNIEXPORT jstring JNICALL Java_pipe_Pipe_FormatMessage -( - JNIEnv *env, - jclass className, - jint errorCode -) -{ +JNIEXPORT jstring JNICALL Java_pipe_Pipe_FormatMessage(JNIEnv *env, + jclass className, jint errorCode) { LPVOID lpMsgBuf; - LPVOID lpDisplayBuf; + LPVOID lpDisplayBuf; DWORD dw = (DWORD) errorCode; FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - dw, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &lpMsgBuf, - 0, NULL ); + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM + | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dw, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &lpMsgBuf, 0, + NULL ); - lpDisplayBuf = (LPVOID)LocalAlloc(LMEM_ZEROINIT, - (lstrlen((LPCTSTR)lpMsgBuf) + 40) * sizeof(TCHAR)); - StringCchPrintf((LPTSTR)lpDisplayBuf, LocalSize(lpDisplayBuf) / sizeof(TCHAR), - TEXT("Failed with error %d: %s"), dw, lpMsgBuf); + lpDisplayBuf = (LPVOID) LocalAlloc(LMEM_ZEROINIT, + (lstrlen((LPCTSTR) lpMsgBuf) + 40) * sizeof(TCHAR)); + StringCchPrintf((LPTSTR) lpDisplayBuf, + LocalSize(lpDisplayBuf) / sizeof(TCHAR), + TEXT("Failed with error %d: %s"), dw, lpMsgBuf); return (jstring) (*env)->NewStringUTF(env, lpDisplayBuf); } -JNIEXPORT void JNICALL Java_pipe_Pipe_Print(JNIEnv *env, jclass className, jstring lpMsgBuf) -{ +JNIEXPORT void JNICALL Java_pipe_Pipe_Print(JNIEnv *env, jclass className, + jstring lpMsgBuf) { const jbyte *str; - str = (*env)->GetStringUTFChars(env, lpMsgBuf, NULL); - if (str == NULL) + str = (*env)->GetStringUTFChars(env, lpMsgBuf, NULL ); + if (str == NULL ) return; printf("Native: %s\n", str); (*env)->ReleaseStringUTFChars(env, lpMsgBuf, str); diff --git a/java/sound/.classpath b/java/sound/.classpath index 124c087..178ed16 100644 --- a/java/sound/.classpath +++ b/java/sound/.classpath @@ -1,8 +1,8 @@ + - diff --git a/java/sound/pipe.dll b/java/sound/pipe.dll index ee7f760..8a948e6 100644 Binary files a/java/sound/pipe.dll and b/java/sound/pipe.dll differ diff --git a/java/sound/src/main/java/old/Converter.java b/java/sound/src/main/java/old/Converter.java index d741824..80a1839 100644 --- a/java/sound/src/main/java/old/Converter.java +++ b/java/sound/src/main/java/old/Converter.java @@ -8,9 +8,9 @@ import java.io.OutputStream; import javazoom.jl.decoder.Bitstream; import javazoom.jl.decoder.BitstreamException; -import mimis.exception.worker.ActivateException; -import mimis.exception.worker.DeactivateException; -import mimis.worker.Worker; +import base.exception.worker.ActivateException; +import base.exception.worker.DeactivateException; +import base.worker.Worker; import com.Ostermiller.util.CircularByteBuffer; diff --git a/java/sound/src/main/java/old/List.java b/java/sound/src/main/java/old/List.java index 5d2b44e..c475277 100644 --- a/java/sound/src/main/java/old/List.java +++ b/java/sound/src/main/java/old/List.java @@ -8,8 +8,8 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.Scanner; -import mimis.exception.worker.ActivateException; -import mimis.worker.Worker; +import base.exception.worker.ActivateException; +import base.worker.Worker; import com.Ostermiller.util.BufferOverflowException; import com.Ostermiller.util.CircularByteBuffer; diff --git a/java/sound/src/main/java/old/Mp3.java b/java/sound/src/main/java/old/Mp3.java index db398f1..35bed12 100644 --- a/java/sound/src/main/java/old/Mp3.java +++ b/java/sound/src/main/java/old/Mp3.java @@ -5,11 +5,11 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; -import mimis.exception.worker.ActivateException; - import org.farng.mp3.MP3File; import org.farng.mp3.TagException; +import base.exception.worker.ActivateException; + public class Mp3 extends Converter { protected File file; protected String title; diff --git a/java/sound/src/main/java/sound/Port.java b/java/sound/src/main/java/sound/Port.java index 17941a2..9430967 100644 --- a/java/sound/src/main/java/sound/Port.java +++ b/java/sound/src/main/java/sound/Port.java @@ -6,9 +6,9 @@ import java.io.OutputStream; import javax.sound.sampled.AudioFormat; -import mimis.exception.worker.ActivateException; -import mimis.exception.worker.DeactivateException; -import mimis.worker.Worker; +import base.exception.worker.ActivateException; +import base.exception.worker.DeactivateException; +import base.worker.Worker; import sound.Format.Standard; import sound.SoxBuilder.File; import sound.SoxBuilder.File.Type; diff --git a/java/sound/src/main/java/sound/Source.java b/java/sound/src/main/java/sound/Source.java index 5918ccc..777470f 100644 --- a/java/sound/src/main/java/sound/Source.java +++ b/java/sound/src/main/java/sound/Source.java @@ -9,13 +9,14 @@ import javax.sound.sampled.SourceDataLine; import javazoom.jl.decoder.JavaLayerException; import javazoom.jl.player.Player; -import mimis.exception.worker.ActivateException; -import mimis.exception.worker.DeactivateException; -import mimis.worker.Worker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import base.exception.worker.ActivateException; +import base.exception.worker.DeactivateException; +import base.worker.Worker; + public class Source implements Consumer { protected Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/java/sound/src/main/java/sound/Stream.java b/java/sound/src/main/java/sound/Stream.java index f437338..3ea55de 100644 --- a/java/sound/src/main/java/sound/Stream.java +++ b/java/sound/src/main/java/sound/Stream.java @@ -7,9 +7,9 @@ import java.io.OutputStreamWriter; import java.net.Socket; import java.net.URL; -import mimis.exception.worker.ActivateException; -import mimis.exception.worker.DeactivateException; -import mimis.worker.Worker; +import base.exception.worker.ActivateException; +import base.exception.worker.DeactivateException; +import base.worker.Worker; import com.Ostermiller.util.CircularByteBuffer; import com.Ostermiller.util.CircularObjectBuffer;