diff --git a/doc/examples/scan.c b/doc/examples/scan.c index 2352de0c..ca31b646 100644 --- a/doc/examples/scan.c +++ b/doc/examples/scan.c @@ -13,10 +13,14 @@ #include #include +#ifdef _MSC_VER +int _tmain(int argc, _TCHAR* argv[]) +#else int main(int argc, char **argv) +#endif { mpg123_handle *m; - int i; + int i, res; if(argc < 2) { fprintf(stderr, "\nI will give you the estimated and exact sample lengths of MPEG audio files.\n"); @@ -29,12 +33,26 @@ int main(int argc, char **argv) for(i = 1; i < argc; ++i) { off_t a, b; - mpg123_open(m, argv[i]); - a = mpg123_length(m); - mpg123_scan(m); + + #ifdef _MSC_VER + res = mpg123_topen(m, argv[i]); + #else + res = mpg123_open(m, argv[i]); + #endif + + a = mpg123_length(m); + res = mpg123_scan(m); b = mpg123_length(m); + + #ifdef _MSC_VER + res = mpg123_tclose(m); + #else + res = mpg123_close(m); + #endif + printf("File %i: estimated %li vs. scanned %li\n", i, (long)a, (long)b); } + mpg123_delete(m); mpg123_exit(); return 0; diff --git a/ports/MSVC++/2008/libmpg123/libmpg123.vcproj b/ports/MSVC++/2008/libmpg123/libmpg123.vcproj index 1586e1f3..861288a1 100644 --- a/ports/MSVC++/2008/libmpg123/libmpg123.vcproj +++ b/ports/MSVC++/2008/libmpg123/libmpg123.vcproj @@ -626,6 +626,10 @@ RelativePath="..\..\..\..\src\libmpg123\readers.c" > + + @@ -638,10 +642,6 @@ RelativePath="..\..\..\..\src\libmpg123\synth.h" > - - diff --git a/ports/MSVC++/2008/mpg123.sln b/ports/MSVC++/2008/mpg123.sln index de965200..49b776a3 100644 --- a/ports/MSVC++/2008/mpg123.sln +++ b/ports/MSVC++/2008/mpg123.sln @@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpglib", "mpglib\mpglib.vcp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "feedseek", "feedseek\feedseek.vcproj", "{472481BF-11B6-41A9-BF6A-8BE16A7F8FD6}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scan", "scan\scan.vcproj", "{245C2785-2FA9-4A6B-8558-35BB8473AEA1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_Generic|Win32 = Debug_Generic|Win32 @@ -67,6 +69,22 @@ Global {472481BF-11B6-41A9-BF6A-8BE16A7F8FD6}.Release_i486|Win32.Build.0 = Release|Win32 {472481BF-11B6-41A9-BF6A-8BE16A7F8FD6}.Release|Win32.ActiveCfg = Release|Win32 {472481BF-11B6-41A9-BF6A-8BE16A7F8FD6}.Release|Win32.Build.0 = Release|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Debug_Generic|Win32.ActiveCfg = Debug|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Debug_Generic|Win32.Build.0 = Debug|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Debug_i386|Win32.ActiveCfg = Debug|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Debug_i386|Win32.Build.0 = Debug|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Debug_i486|Win32.ActiveCfg = Debug|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Debug_i486|Win32.Build.0 = Debug|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Debug|Win32.ActiveCfg = Debug|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Debug|Win32.Build.0 = Debug|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Release_Generic|Win32.ActiveCfg = Release|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Release_Generic|Win32.Build.0 = Release|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Release_i386|Win32.ActiveCfg = Release|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Release_i386|Win32.Build.0 = Release|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Release_i486|Win32.ActiveCfg = Release|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Release_i486|Win32.Build.0 = Release|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Release|Win32.ActiveCfg = Release|Win32 + {245C2785-2FA9-4A6B-8558-35BB8473AEA1}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ports/MSVC++/2008/scan/scan.vcproj b/ports/MSVC++/2008/scan/scan.vcproj new file mode 100644 index 00000000..d405ff93 --- /dev/null +++ b/ports/MSVC++/2008/scan/scan.vcproj @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ports/MSVC++/mpg123.h b/ports/MSVC++/mpg123.h index 25f23eb8..b7bff664 100644 --- a/ports/MSVC++/mpg123.h +++ b/ports/MSVC++/mpg123.h @@ -25,6 +25,7 @@ extern "C" { // Wrapper around mpg123_open that supports path names with unicode // characters EXPORT int mpg123_topen(mpg123_handle *fr, const _TCHAR *path); + EXPORT int mpg123_tclose(mpg123_handle *fr); #ifdef __cplusplus } diff --git a/ports/MSVC++/msvc.c b/ports/MSVC++/msvc.c index 278f8fc8..a26c8b02 100644 --- a/ports/MSVC++/msvc.c +++ b/ports/MSVC++/msvc.c @@ -18,8 +18,15 @@ int mpg123_topen(mpg123_handle *fr, const _TCHAR *path) { + int ret; int filept; /* descriptor of opened file/stream */ + ret = mpg123_replace_reader(fr, _read, _lseek); + if(ret != MPG123_OK) + { + return ret; + } + if((filept = _topen(path, O_RDONLY|O_BINARY)) < 0) { /* Will not work with unicode path name @@ -31,13 +38,21 @@ int mpg123_topen(mpg123_handle *fr, const _TCHAR *path) } if(mpg123_open_fd(fr, filept) == MPG123_OK) { - /* Tell mpg123 that it is allowed to close the fd and be happy. */ - fr->rdat.flags |= READER_FD_OPENED; return MPG123_OK; } else { - close(filept); + _close(filept); return MPG123_ERR; } } + +int mpg123_tclose(mpg123_handle *fr) +{ + int ret; + + ret = mpg123_close(fr); + _close(fr->rdat.filept); + + return ret; +}