diff options
| author | jhurst <jhurst@cinecert.com> | 2016-12-02 18:45:14 +0000 |
|---|---|---|
| committer | jhurst <> | 2016-12-02 18:45:14 +0000 |
| commit | 5f38f82f9bfc69fdbae47a71f587ab5b7e80e594 (patch) | |
| tree | 24aed62f35f13cda0905bbc11cfb02f9ef30d623 /src/KM_fileio.h | |
| parent | 6f5cb81faa06f80b07e2d641732b2a8b692e14d8 (diff) | |
o Replaced WIN32 directory scanner with dirent_win.h
o The NamespaceURI property of AS-02 timed text files has been exposed in the API
and via as-02-wrap -P. This behavior replaces previous bad behavior, but puts
responsibility for selecting the correct value on the operator.
o Exposed CreatePNGNameId and CreateFontNameId subroutines in AS_02::TimedText
o Adjusted UUID generation based on PNG and font names to exclude paths by
inserting a call to PathBasename at each Id generation site
Diffstat (limited to 'src/KM_fileio.h')
| -rwxr-xr-x | src/KM_fileio.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/KM_fileio.h b/src/KM_fileio.h index 18dcf0e..264509a 100755 --- a/src/KM_fileio.h +++ b/src/KM_fileio.h @@ -1,5 +1,5 @@ /* -Copyright (c) 2004-2014, John Hurst +Copyright (c) 2004-2016, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -37,6 +37,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef KM_WIN32 # include <io.h> +# include "dirent_win.h" #else # include <dirent.h> # include <unistd.h> @@ -55,12 +56,7 @@ namespace Kumu class DirScanner { public: -#ifdef KM_WIN32 - __int64 m_Handle; - struct _finddatai64_t m_FileInfo; -#else DIR* m_Handle; -#endif DirScanner(void); ~DirScanner() { Close(); } @@ -83,12 +79,7 @@ namespace Kumu class DirScannerEx { std::string m_Dirname; -#ifdef KM_WIN32 - __int64 m_Handle; - struct _finddatai64_t m_FileInfo; -#else DIR* m_Handle; -#endif KM_NO_COPY_CONSTRUCT(DirScannerEx); |