diff --git a/core/audio_player_dsound.cpp b/core/audio_player_dsound.cpp index 2509f0872..07bb5d1bc 100644 --- a/core/audio_player_dsound.cpp +++ b/core/audio_player_dsound.cpp @@ -97,7 +97,7 @@ void DirectSoundPlayer::OpenStream() { waveFormat.cbSize = 0; // Create the buffer initializer - int aim = 0x10000; + int aim = 0x20000; int min = DSBSIZE_MIN; int max = DSBSIZE_MAX; bufSize = MIN(MAX(min,aim),max); diff --git a/core/readme.txt b/core/readme.txt index 9debdc325..c73128cce 100644 --- a/core/readme.txt +++ b/core/readme.txt @@ -13,18 +13,17 @@ Third, this is all available under the BSD license. According to GNU itself, BSD Some notes about the procedure: All paths should be added to the global msvc settings or you might encounter some problems. -This guide assumes Visual Studio 2003 is used, it might work in other versions but it is guaranteed -to fail with other compilers due to the avisynth dependency. +This guide assumes Visual Studio 2003 or 2005 is used, it might work in other versions but it +is guaranteed to fail with other compilers due to the avisynth dependency. While you can compile most libraries yourself these instructions will assume you want to download precompiled versions whenever possible. Also note that in most other cases where precompiled libraries are available they're unsuitable for use in aegisub. Building instructions (dependencies): -1. Download and install wxWidgets 2.6.x (www.wxwidgets.org, 2.6.2 used when this guide was written). -Open include\wx\msw\setup.h and set WXWIN_COMPATIBILITY_2_4 to 0 and wxUSE_UNICODE to 1. To compile the libraries -first open the visual studio command prompt and go to build\msw. Run "nmake makefile.vc UNICODE=1 BUILD=debug" -and then "nmake makefile.vc UNICODE=1 BUILD=release" to generate the libraries required for aegisub. +1. Download and install wxWidgets 2.8.x (www.wxwidgets.org, 2.8.0 used when this guide was written). +Open build\msw\wx.sln, and set the active configuration to "Unicode Debug". Compile that. After that, set it to +"Unicode Release", and also compile that. Include: include @@ -79,31 +78,32 @@ Building instructions (aegisub): 1. Create a new blank Win32 c++ project in msvc. -2. Add all h, cpp and rc files in the "core", "PRS" and "FexTrackerSource" folders to the project. +2. Copy setup0.h as setup.h, and edit any possible configurations you might want there. Make sure that you SVN ignore that +file (setup.h), as you are NOT supposed to commit it to the repository. -3. Open the project settings. Add UNICODE to the preprocessor defines, and set the code generation to multi threaded (debug) dll. +3. Add all h, cpp and rc files in the "core", "PRS" and "FexTrackerSource" folders to the project. -3.1. OPTIONAL - Define NO_SPELLCHECKER if you want to compile without aspell support. +4. Open the project settings. Add UNICODE to the preprocessor defines, and set the code generation to multi threaded (debug) dll. -4. Set up the build-versioning stuff. +5. Set up the build-versioning stuff. -4.1. Open projects settings and select All Configurations. Go to Build Events, Pre-build Event. +5.1. Open projects settings and select All Configurations. Go to Build Events, Pre-build Event. Change the Command Line to the following two lines (click "..."): cd $(InputDir)\core\build c:\python24\python.exe make-svn-rev-header.py You'll obviously want to change the path to the Python interpreter. -4.2 Create the file core/build/build-credit.h and add this line to it: +5.2 Create the file core/build/build-credit.h and add this line to it: #define BUILD_CREDIT "yournick" Of course without indendation and replacing the yournick part. -5. Add the libraries to the linker input. If you compiled portaudio with wmme you have to remove dsound.lib and srmiids.lib +6. Add the libraries to the linker input. If you compiled portaudio with wmme you have to remove dsound.lib and srmiids.lib and replace PAStaticDS*.lib with the wmme version. Remove libaspell-15-dll.lib if you defined NO_SPELLCHECKER. Link to these libraries for release: -freetype2110MT.lib libaspell-15-dll.lib wxzlib.lib wxpng.lib wxregexu.lib wxmsw26u_adv.lib wxmsw26u_core.lib wxbase26u.lib wxmsw26u_media.lib dsound.lib PAStaticDSMT.lib Vfw32.lib winmm.lib lua50MT.lib comctl32.lib rpcrt4.lib advapi32.lib wsock32.lib strmiids.lib +freetype2110MT.lib libaspell-15-dll.lib wxzlib.lib wxpng.lib wxregexu.lib wxmsw28u_adv.lib wxmsw28u_core.lib wxbase28u.lib wxmsw28u_media.lib dsound.lib PAStaticDSMT.lib Vfw32.lib winmm.lib lua50MT.lib comctl32.lib rpcrt4.lib advapi32.lib wsock32.lib strmiids.lib Link to these libraries for debug: -freetype2110MT_D.lib libaspell-15-dll.lib dsound.lib PAStaticDSMTd.lib Vfw32.lib lua50MTd.lib wxzlibd.lib wxpngd.lib wxregexud.lib wxbase26ud.lib wxmsw26ud_media.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib comctl32.lib rpcrt4.lib winmm.lib advapi32.lib wsock32.lib strmiids.lib +freetype2110MT_D.lib libaspell-15-dll.lib dsound.lib PAStaticDSMTd.lib Vfw32.lib lua50MTd.lib wxzlibd.lib wxpngd.lib wxregexud.lib wxbase28ud.lib wxmsw28ud_media.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib comctl32.lib rpcrt4.lib winmm.lib advapi32.lib wsock32.lib strmiids.lib 6. Compile and wait. \ No newline at end of file diff --git a/core/todo.txt b/core/todo.txt deleted file mode 100644 index d72d880fb..000000000 --- a/core/todo.txt +++ /dev/null @@ -1,37 +0,0 @@ -(Idented lines require the previous non-idented one to work) - - -High priority: - -Insert subtitles from another file, with possible shifting -Open audio range - - -Medium priority: - -Play video on styling assistant (req by Kobi) -Fix Spellchecker (assigned to nmap) -Options screen (assigned to nmap) -Advanced visual typesetting -Audio timing assistant -Shift times by current time -SSA "Effects" dialog (as in, the "Effects" field in SSA standard) -Jump to with negative values (req by jfs) -Shift start/end by one, pushing adjascent line so they don't overlap (req by Mentar) -Sort subs by initial time and style (req by Jcubed) -Check for updates -Use page up/page down to switch video to prev/next selected subtitle (req by Mentar) -Bleeding Checker (window that shows start/end frames and one before/after each) -Make margins boxes "replace when type" style -Styles preview (assigned to jfs) - - -Low priority: - -Read sectioning info from .yap (req by Mentar) (according to Myrsloik, this might be almost impossible) -Edit output frame numbers (req by nmap) -Support character set encoding by style (req by jfs) -Semi-realtime preview of subs; refresh video if user hasn't entered text in a while (req by jfs) -Filter list for displaying of subs by critereas (req by Jcubed) -Multiple files support -Detachable video window (req by maxx-)