Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removing the old style code cases

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-09-26 14:51:04 +00:00
parent 4eb124f5bd
commit fe8712b53e
1 changed files with 15 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/mac/carbon/sound.cpp
View File

@@ -36,9 +36,9 @@
// 5) IsMovieDone(), MoviesTask() //2nd param is minimum wait time to allocate to quicktime // 5) IsMovieDone(), MoviesTask() //2nd param is minimum wait time to allocate to quicktime
// //
// File: // File:
// 1) Obtain FSSpec // 1) Path as CFString
// 2) Call OpenMovieFile // 2) Call QTNewDataReferenceFromFullPathCFString
// 3) Call NewMovieFromFile // 3) Call NewMovieFromDataRef
// 4) Call CloseMovieFile // 4) Call CloseMovieFile
// 4) PlayMovie(); // 4) PlayMovie();
// 5) IsMovieDone(), MoviesTask() //2nd param is minimum wait time to allocate to quicktime // 5) IsMovieDone(), MoviesTask() //2nd param is minimum wait time to allocate to quicktime
@@ -386,73 +386,20 @@ bool wxSound::DoPlay(unsigned flags) const
return false; return false;
OSErr err = noErr ; OSErr err = noErr ;
//NB: RN: Stefan - I think the 10.3 path functions are broken if kQTNativeDefaultPathStyle is
//going to trigger a warning every time it is used - where its _supposed to be used_!! Handle dataRef = NULL;
//(kQTNativePathStyle is negative but the function argument is unsigned!) OSType dataRefType;
//../src/mac/carbon/sound.cpp: In member function `virtual bool
// wxSound::DoPlay(unsigned int) const': err = QTNewDataReferenceFromFullPathCFString(wxMacCFStringHolder(m_sndname,wxLocale::GetSystemEncoding()),
//../src/mac/carbon/sound.cpp:387: warning: passing negative value ` (UInt32)kQTNativeDefaultPathStyle, 0, &dataRef, &dataRefType);
// kQTNativeDefaultPathStyle' for argument passing 2 of `OSErr
// QTNewDataReferenceFromFullPathCFString(const __CFString*, long unsigned int, wxASSERT(err == noErr);
// long unsigned int, char***, OSType*)'
//../src/mac/carbon/sound.cpp:387: warning: argument of negative value ` if (NULL != dataRef || err != noErr)
// kQTNativeDefaultPathStyle' to `long unsigned int'
#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 )
if ( UMAGetSystemVersion() >= 0x1030 )
{ {
Handle dataRef = NULL; err = NewMovieFromDataRef( &movie, newMovieDontAskUnresolvedDataRefs , NULL, dataRef, dataRefType );
OSType dataRefType;
err = QTNewDataReferenceFromFullPathCFString(wxMacCFStringHolder(m_sndname,wxLocale::GetSystemEncoding()),
//FIXME: Why does this have to be casted?
(unsigned int)kQTNativeDefaultPathStyle,
//FIXME: End
0, &dataRef, &dataRefType);
wxASSERT(err == noErr); wxASSERT(err == noErr);
DisposeHandle(dataRef);
if (NULL != dataRef || err != noErr)
{
err = NewMovieFromDataRef( &movie, newMovieDontAskUnresolvedDataRefs , NULL, dataRef, dataRefType );
wxASSERT(err == noErr);
DisposeHandle(dataRef);
}
}
else
#endif
{
short movieResFile;
FSSpec sfFile;
#ifdef __WXMAC__
wxMacFilename2FSSpec( m_sndname , &sfFile ) ;
#else
int nError;
if ((nError = NativePathNameToFSSpec ((char*) m_sndname.c_str(), &sfFile, 0)) != noErr)
{
/*
wxLogSysError(wxString::Format(wxT("File:%s does not exist\nError:%i"),
m_sndname.c_str(), nError));
*/
return false;
}
#endif
if (OpenMovieFile (&sfFile, &movieResFile, fsRdPerm) != noErr)
{
wxLogSysError(wxT("Quicktime couldn't open the file"));
return false;
}
short movieResID = 0;
Str255 movieName;
err = NewMovieFromFile (
&movie,
movieResFile,
&movieResID,
movieName,
newMovieActive,
NULL); //wasChanged
CloseMovieFile (movieResFile);
} }
if (err != noErr) if (err != noErr)