README_win32.txt gui/scrobui.dsp gui/scrobui.dsw loopdub.dsp loopdub.dsw @@ -3,3 +3,7 @@ Initial import into CVS. Marked as version 0.1 +* May 15, 2005 + +Windows version sort of works. Still needs some thread priority bugs +to be worked out. ChangeLog @@ -34,7 +34,6 @@ short Lowpass::Work(short sample) // filter float temp_y; - int i; float alpha, omega, sn, cs; float a0, a1, a2, b0, b1, b2; float coef[5]; filter.cpp @@ -5,8 +5,8 @@ class Filter { public: - virtual void Initialize() {} - virtual short Work(short sample) {} + virtual void Initialize() {} + virtual short Work(short sample) { return 0; } }; class Lowpass : public Filter filter.h @@ -510,37 +510,41 @@ void DrawingTools::FillRect(Rect r, int color) if (r.IsValid()) SDL_FillRect(m_pSurface, &sr, color); } - + +#include <assert.h> bool DrawingTools::LoadCharacterData(char *filename) -{ - ifstream charfile(filename, ios::in | ios::binary); - if (!charfile.is_open()) +{ + ifstream charfile(filename, ios::in | ios::binary); + + if (!charfile.is_open()) { fprintf(stderr, "Couldn't open %s.\n", filename); return false; - } - + } + for (int i=0; i<95; i++) { - charfile.read((char*)&m_nCharOffsets[i], 2); - charfile.read((char*)&m_nCharWidths[i], 1); - } + charfile.read((char*)&m_nCharOffsets[i], 2); + charfile.read((char*)&m_nCharWidths[i], 1); + } short sx, sy; - charfile.read((char*)&sx, 2); - charfile.read((char*)&sy, 2); - m_nFontHeight = sy; - - m_pCharacterData = new char[sx*sy]; - - charfile.read(m_pCharacterData, sx*sy); - if (charfile.fail() || charfile.bad()) + charfile.read((char*)&sx, 2); + charfile.read((char*)&sy, 2); + m_nFontHeight = sy; + + m_pCharacterData = new char[sx*sy]; + + if (!charfile.fail() && !charfile.bad()) + charfile.read(m_pCharacterData, sx*sy); + + if (charfile.fail() || charfile.bad()) { fprintf(stderr, "Error reading character data.\n"); delete m_pCharacterData; m_pCharacterData = NULL; return false; - } + } m_pCharacterSurface = SDL_CreateRGBSurfaceFrom(m_pCharacterData, sx, sy, 8, sx, 0, 0, 0, 0); if (!m_pCharacterSurface) gui/scrobui.cpp @@ -1,7 +1,7 @@ #ifndef _SCROBUI_H_ #define _SCROBUI_H_ -#include <SDL/SDL.h> +#include <SDL.h> //namespace ScrobUI { gui/scrobui.h @@ -6,12 +6,17 @@ #include "scrobui.h" #include <string.h> #include <ctype.h> -#include <stdlib.h> -#include <dirent.h> -#include <sys/stat.h> - -#ifdef WIN32 -#define snprintf _snprintf +#include <stdlib.h> + +#ifdef WIN32 + #include <io.h> + #define snprintf _snprintf + #define realpath(srcpath, destpath) _fullpath(destpath, srcpath, MAX_PATH) + #define DIR_SEPARATOR "\\" +#else + #include <dirent.h> + #include <sys/stat.h> + #define DIR_SEPARATOR "/" #endif #ifndef min @@ -344,7 +349,8 @@ bool Image::Create(Scrob *pParent, const Rect& r, int width, int height, char* d if (m_nWidth < 0) m_nWidth = 0; m_nHeight = height; if (m_nHeight < 0) m_nHeight = 0; - m_pData = data; + m_pData = data; + return true; } void Image::Draw() @@ -400,7 +406,8 @@ bool Button::Create(Scrob *pParent, const Rect& r, char *strText, int color, int Label::Create(pParent, r, strText, color, bkcolor); m_nCommand = command; m_nCommandValue = command_value; - m_bToggle = bToggle; + m_bToggle = bToggle; + return true; } @@ -640,12 +647,14 @@ FileBrowser::FileBrowser() : Scrob() m_nRows = 0; m_nColumns = 0; m_bShowDir = true; - m_pBox = NULL; + m_pBox = NULL; + m_pFolder = NULL; m_nItemWidth = 0; m_nCommand = 0; m_bExt = false; m_bBase = false; m_nNames = 0; + m_nDrawFileOffset = 0; } FileBrowser::FileBrowser(Scrob *pParent, const Rect& r, char *strDir, int command, bool showDir) @@ -654,10 +663,12 @@ FileBrowser::FileBrowser(Scrob *pParent, const Rect& r, char *strDir, int comman m_nRows = 0; m_nColumns = 0; m_pBox = NULL; + m_pFolder = NULL; m_nItemWidth = 0; m_bExt = false; m_bBase = false; m_nNames = 0; + m_nDrawFileOffset = 0; Create(pParent, r, strDir, command, showDir); } @@ -711,7 +722,7 @@ void FileBrowser::Draw() c*m_nItemWidth+m_nItemWidth+x-2, r*h+1+h)); dt.TextOut(Point(c*m_nItemWidth+x,r*h+1), m_names[i], - (m_types[i] & DT_DIR) ? 2 : 3); + m_isdir[i] ? 2 : 3); } dt.SetClipRect(); @@ -747,11 +758,60 @@ void FileBrowser::Draw() dt.PutPixel(Point(x+2, y-2), 2); dt.PutPixel(Point(x+2, y+2), 2); } -} - +} + void FileBrowser::SetDirectory(char *strDir) -{ - char realdir[1024]; +{ +#ifdef WIN32 + + char realdir[MAX_PATH]; + if (!_fullpath(realdir, strDir, MAX_PATH)) + return; + strncpy(m_strDir, realdir, MAX_PATH); + if (m_pFolder) + m_pFolder->SetText(m_strDir); + + // Are we in base directory? + bool bBaseDir = m_bBase ? strcmp(m_strDir, m_strBase)==0 : false; + + // Append search item + strcat(realdir, DIR_SEPARATOR); + strcat(realdir, "*"); + + // Read directory + _finddata_t fd; + long lSearch = _findfirst(realdir, &fd); + if (lSearch==-1) + return; + + m_nNames=0; + char pathstr[MAX_PATH]; + + int extlen=0; + if (m_bExt) + extlen = strlen(m_strExt); + + do { + if (m_bExt + && stricmp(fd.name+strlen(fd.name)-extlen, m_strExt)!=0 + && !(fd.attrib & _A_SUBDIR)) + continue; + + if (strcmp(fd.name, ".")==0) continue; + if (bBaseDir && strcmp(fd.name, "..")==0) continue; + + strcpy(pathstr, m_strDir); + strcat(pathstr, DIR_SEPARATOR); + strcat(pathstr, fd.name); + m_isdir[m_nNames] = (fd.attrib & _A_SUBDIR)!=0; + strcpy(m_names[m_nNames++], fd.name); + } while ((_findnext(lSearch, &fd)==0) && (m_nNames < MAX_FB_NAMES)); + + _findclose(lSearch); + +#else + + char realdir[MAX_PATH]; if (!realpath(strDir, realdir)) return; strncpy(m_strDir, realdir, MAX_PATH); @@ -765,7 +825,7 @@ void FileBrowser::SetDirectory(char *strDir) DIR *dir; dir = opendir(m_strDir); m_nNames=0; - char pathstr[1024]; + char pathstr[MAX_PATH]; struct stat st; if (dir) { struct dirent *de; @@ -776,7 +836,7 @@ void FileBrowser::SetDirectory(char *strDir) while ((de = readdir(dir)) && m_nNames<MAX_FB_NAMES) { strcpy(pathstr, m_strDir); - strcat(pathstr, "/"); + strcat(pathstr, DIR_SEPARATOR); strcat(pathstr, de->d_name); if ((stat(pathstr, &st)==0) && S_ISDIR(st.st_mode)) @@ -786,12 +846,14 @@ void FileBrowser::SetDirectory(char *strDir) { if (strcmp(de->d_name, ".")==0) continue; if (bBaseDir && strcmp(de->d_name, "..")==0) continue; - m_types[m_nNames] = de->d_type; + m_isdir[m_nNames] = (de->d_type & DT_DIR)!=0; strcpy(m_names[m_nNames++], de->d_name); } } closedir(dir); - } + } + +#endif m_nDrawFileOffset = 0; @@ -811,7 +873,7 @@ void FileBrowser::SetExtension(char *strExt) m_bExt = false; } } - + void FileBrowser::SetBase(char *strBase) { if (strBase) { @@ -846,18 +908,18 @@ void FileBrowser::OnMouseUp(Point mouse) int n = c*m_nRows + r + m_nDrawFileOffset; if (n < m_nNames) { - if (m_types[n] & DT_DIR) { - char path[MAX_PATH], real[MAX_PATH]; + if (m_isdir[n]) { + char path[MAX_PATH]; strcpy(path, m_strDir); if (path[strlen(path)-1]!='/') - strcat(path, "/"); + strcat(path, DIR_SEPARATOR); strcat(path, m_names[n]); SetDirectory(path); } else { strcpy(m_strFile, m_strDir); - if (m_strFile[strlen(m_strFile)-1]!='/') - strcat(m_strFile, "/"); + if (m_strFile[strlen(m_strFile)-1]!=DIR_SEPARATOR[0]) + strcat(m_strFile, DIR_SEPARATOR); strcat(m_strFile, m_names[n]); gui.SetCommand(m_nCommand, (void*)m_strFile); gui/toolkit.cpp @@ -11,10 +11,12 @@ #define MAX_FB_NAMES 50 -#ifdef WIN32 +#ifndef MAX_PATH +#ifdef WIN32 #define MAX_PATH _MAX_PATH #else #define MAX_PATH PATH_MAX +#endif #endif @@ -199,7 +201,7 @@ protected: bool m_bExt; char m_strBase[MAX_PATH]; bool m_bBase; - char m_types[MAX_FB_NAMES]; + bool m_isdir[MAX_FB_NAMES]; char m_names[MAX_FB_NAMES][256]; int m_nNames; gui/toolkit.h @@ -2,9 +2,13 @@ #define _LOOPDUB_CPP_ #include <stdio.h> #include <string.h> -#include <unistd.h> #include "loopdub.h" #include "ld_logo.h" + +#ifdef WIN32 +#else + #include <unistd.h> +#endif /* One global LoopDub object */ LoopDub app; @@ -27,23 +31,20 @@ LoopDub::LoopDub() m_nKeysChannel = -1; for (int i=0; i<MAX_KEYS; i++) m_Keys[i].on = false; - - if (pthread_mutex_init(&mutex, NULL)!=0) { - printf("Couldn't init mutex?!\n"); - exit(0); - } + + CREATEMUTEX(mutex); } LoopDub::~LoopDub() { - pthread_mutex_destroy(&mutex); + DESTROYMUTEX(mutex); } void LoopDub::FillBuffers(void *param) { LoopDub& app = *(LoopDub*)param; - pthread_mutex_lock(&app.mutex); + LOCKMUTEX(app.mutex); short* pBufferL = app.m_Player.LeftBuffer(); short* pBufferR = app.m_Player.RightBuffer(); @@ -102,22 +103,24 @@ void LoopDub::FillBuffers(void *param) app.updated = false; } - pthread_mutex_unlock(&app.mutex); + UNLOCKMUTEX(app.mutex); } -void* loadSampleThread(void* pApp) -{ +THREADFUNC loadSampleThread(void* pApp) +{ + if (!pApp) return NULL; + LoopDub &app = *(LoopDub*)pApp; Sample *pSample = new Sample(); if (pSample && pSample->LoadFromFile(app.m_strLoadingSample)) { - pthread_mutex_lock(&app.mutex); + LOCKMUTEX(app.mutex); if (app.m_nLength==0) app.m_nLength = pSample->m_nSamples; Sample *pOldSample = app.m_pLoopOb[app.m_nLoadingSampleFor]->SetSample(pSample); if (pOldSample) delete pOldSample; - pthread_mutex_unlock(&app.mutex); + UNLOCKMUTEX(app.mutex); } return NULL; @@ -213,6 +216,8 @@ int LoopDub::Run() printf("Couldn't initialize player.\n"); return 1; } + + m_Player.Play(); SDL_TimerID timerID=0; SDL_Event *pEvent; @@ -221,7 +226,7 @@ int LoopDub::Run() { gui.WaitEvent(); - pthread_mutex_lock(&mutex); + LOCKMUTEX(mutex); if ((pEvent=gui.GetEvent())->type == SDL_KEYDOWN && pEvent->key.keysym.sym == SDLK_RETURN @@ -294,9 +299,9 @@ int LoopDub::Run() m_nLoadingSampleFor = s; strcpy(m_strLoadingSample, (char*)value); - - pthread_t thread; - pthread_create(&thread, NULL, loadSampleThread, (void*)this); + + HTHREAD thread; + CREATETHREAD(thread, loadSampleThread, &app); } else if (cmd>=CMD_CLOSE && cmd<(CMD_CLOSE+N_LOOPS)) { @@ -338,13 +343,13 @@ int LoopDub::Run() app.updated = true; - pthread_mutex_unlock(&mutex); + UNLOCKMUTEX(mutex); m_Midi.CheckMsg(); } } app.updated = true; - pthread_mutex_unlock(&mutex); + UNLOCKMUTEX(mutex); m_Player.Stop(); return 0; @@ -352,7 +357,7 @@ int LoopDub::Run() int main(int argc, char* argv[]) { - if ((argc > 1) && argv[1]) { + if ((argc > 1) && argv[1]) { if (strcmp(argv[1], "-v")==0) { printf("LoopDub " APP_VERSION "\n"); exit(0); loopdub.cpp @@ -1,11 +1,12 @@ #ifndef _LOOPDUB_H_ #define _LOOPDUB_H_ - -#include <pthread.h> -#include <SDL/SDL.h> -#include "scrobui.h" -#include "portmidi/pm_common/portmidi.h" -//using namespace ScrobUI; + +#include "platform.h" +#include <SDL.h> +#include "gui/scrobui.h" +#include "portmidi/pm_common/portmidi.h" +//using namespace ScrobUI; + // Global definitions #define N_LOOPS 8 @@ -82,7 +83,7 @@ public: Slider *m_pVolumeSlider; Button *m_pAutoCueButton; - pthread_mutex_t mutex; + HMUTEX mutex; // loading int m_nLoadingSampleFor; loopdub.h @@ -189,8 +189,9 @@ bool LoopOb::Create(Scrob *pParent, const Rect& r, int number, Sample *pSample) AddChild(m_pWaveOb); m_pWaveOb->SetColor(2); - - for (int i=0; i<2; i++) { + + int i; + for (i=0; i<2; i++) { m_pIndicator[i] = new IndicatorOb; if (!m_pIndicator[i]->Create(this, Rect(LOOP_X, 2, 61, r.Height()-3))) return false; @@ -303,7 +304,7 @@ bool LoopOb::Create(Scrob *pParent, const Rect& r, int number, Sample *pSample) m_filterbank[0] = &lowpass; m_filterbank[1] = &delay; - for (int i=0; i<N_FILTERS; i++) + for (i=0; i<N_FILTERS; i++) m_filterbank[i]->Initialize(); return true; loopob.cpp @@ -5,7 +5,7 @@ #ifndef _LOOPOB_H_ #define _LOOPOB_H_ -#include "scrobui.h" +#include "gui/scrobui.h" //using namespace ScrobUI; #include "sample.h" #include "filter.h" loopob.h @@ -1,13 +1,13 @@ // Sample.cpp: implementation of the Sample class. // ////////////////////////////////////////////////////////////////////// - + +#include "platform.h" #include "sample.h" #include <math.h> #include <string.h> -#include <stdio.h> -#include <unistd.h> - +#include <stdio.h> + Sample::Sample() { m_pData = 0; @@ -176,8 +176,8 @@ bool Sample::LoadFromFile(char *filename) while (size-- > 0) fread(&dw, 1, 1, f); } - - usleep(10); + + USLEEP(10); fread(&dw, 4, 1, f); } sample.cpp 468b69c75db072c72b6697ffcf7d9e8711b54ec3 radarsat1 radarsat1 http://github.com/radarsat1/LoopDub/commit/0f4c99f0cbab63acaf3ec005ce2ee06319eb897f 0f4c99f0cbab63acaf3ec005ce2ee06319eb897f 2005-05-15T14:58:52-07:00 2005-05-15T14:58:52-07:00 Windows version sort of works, still has some thread priority bugs to be worked out. Need to ensure VC++ documentation is good. 7f7da87000fa15650d94db27c6574c12924c4e22 radarsat1 radarsat1