diff --git a/CocosDenshion/android/SimpleAudioEngine.cpp b/CocosDenshion/android/SimpleAudioEngine.cpp index 6208ed6668..ebcac6cf09 100644 --- a/CocosDenshion/android/SimpleAudioEngine.cpp +++ b/CocosDenshion/android/SimpleAudioEngine.cpp @@ -54,11 +54,6 @@ void SimpleAudioEngine::end() endJNI(); } -void SimpleAudioEngine::setResource(const char* pszZipFileName) -{ - -} - void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath) { preloadBackgroundMusicJNI(pszFilePath); diff --git a/CocosDenshion/bada/SimpleAudioEngine.cpp b/CocosDenshion/bada/SimpleAudioEngine.cpp index 217bbee8c3..df50b54746 100644 --- a/CocosDenshion/bada/SimpleAudioEngine.cpp +++ b/CocosDenshion/bada/SimpleAudioEngine.cpp @@ -295,11 +295,6 @@ void SimpleAudioEngine::end() } } -void SimpleAudioEngine::setResource(const char* pszZipFileName) -{ - -} - void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath) { openMediaPlayer(s_pBackPlayer, pszFilePath); diff --git a/CocosDenshion/include/SimpleAudioEngine.h b/CocosDenshion/include/SimpleAudioEngine.h index 3e87118e7b..5e510b7492 100644 --- a/CocosDenshion/include/SimpleAudioEngine.h +++ b/CocosDenshion/include/SimpleAudioEngine.h @@ -52,12 +52,6 @@ public: */ static void end(); - /** - @brief Set the zip file name - @param pszZipFileName The relative path of the .zip file - */ - static void setResource(const char* pszZipFileName); - /** @brief Preload background music @param pszFilePath The path of the background music file,or the FileName of T_SoundResInfo diff --git a/CocosDenshion/ios/SimpleAudioEngine.mm b/CocosDenshion/ios/SimpleAudioEngine.mm index 11e5ee0e49..175b97f122 100644 --- a/CocosDenshion/ios/SimpleAudioEngine.mm +++ b/CocosDenshion/ios/SimpleAudioEngine.mm @@ -172,11 +172,6 @@ void SimpleAudioEngine::end() static_end(); } -void SimpleAudioEngine::setResource(const char* pszZipFileName) -{ - -} - void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath) { static_preloadBackgroundMusic(pszFilePath); diff --git a/CocosDenshion/linux/SimpleAudioEngine.cpp b/CocosDenshion/linux/SimpleAudioEngine.cpp index f84f169a74..fd14c2a7ff 100644 --- a/CocosDenshion/linux/SimpleAudioEngine.cpp +++ b/CocosDenshion/linux/SimpleAudioEngine.cpp @@ -33,9 +33,6 @@ void SimpleAudioEngine::end() { // return; } -void SimpleAudioEngine::setResource(const char* pszZipFileName) { -} - ////////////////////////////////////////////////////////////////////////// // BackgroundMusic ////////////////////////////////////////////////////////////////////////// diff --git a/CocosDenshion/marmalade/SimpleAudioEngine.cpp b/CocosDenshion/marmalade/SimpleAudioEngine.cpp index 81d7eafa81..c51fdba554 100644 --- a/CocosDenshion/marmalade/SimpleAudioEngine.cpp +++ b/CocosDenshion/marmalade/SimpleAudioEngine.cpp @@ -95,11 +95,6 @@ namespace CocosDenshion } } - void SimpleAudioEngine::setResource(const char* pszZipFileName) - { - // todo - } - void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath) { s3eFile *fileHandle = s3eFileOpen(pszFilePath, "rb"); diff --git a/CocosDenshion/qnx/SimpleAudioEngine.cpp b/CocosDenshion/qnx/SimpleAudioEngine.cpp index dc5a9d210d..7ee64bfbfd 100644 --- a/CocosDenshion/qnx/SimpleAudioEngine.cpp +++ b/CocosDenshion/qnx/SimpleAudioEngine.cpp @@ -158,10 +158,6 @@ namespace CocosDenshion stopBackground(true); } - void SimpleAudioEngine::setResource(const char* pszZipFileName) - { - } - // // OGG support // diff --git a/CocosDenshion/win32/SimpleAudioEngine.cpp b/CocosDenshion/win32/SimpleAudioEngine.cpp index 120f16ffcc..cafe899d6a 100644 --- a/CocosDenshion/win32/SimpleAudioEngine.cpp +++ b/CocosDenshion/win32/SimpleAudioEngine.cpp @@ -62,10 +62,6 @@ void SimpleAudioEngine::end() return; } -void SimpleAudioEngine::setResource(const char* pszZipFileName) -{ -} - ////////////////////////////////////////////////////////////////////////// // BackgroundMusic ////////////////////////////////////////////////////////////////////////// diff --git a/cocos2dx/platform/CCFileUtils.h b/cocos2dx/platform/CCFileUtils.h index 3c3ef293b3..9d604088aa 100644 --- a/cocos2dx/platform/CCFileUtils.h +++ b/cocos2dx/platform/CCFileUtils.h @@ -157,15 +157,6 @@ public: static void setIsPopupNotify(bool bNotify); static bool getIsPopupNotify(); - /////////////////////////////////////////////////// - // interfaces on wophone - /////////////////////////////////////////////////// - /** - @brief Set the resource zip file name - @param pszZipFileName The relative path of the .zip file - */ - static void setResource(const char* pszZipFileName); - /////////////////////////////////////////////////// // interfaces on ios /////////////////////////////////////////////////// diff --git a/cocos2dx/platform/android/CCFileUtils.cpp b/cocos2dx/platform/android/CCFileUtils.cpp index 5c8f9747c2..4d2d437e9b 100644 --- a/cocos2dx/platform/android/CCFileUtils.cpp +++ b/cocos2dx/platform/android/CCFileUtils.cpp @@ -118,11 +118,6 @@ unsigned char* CCFileUtils::getFileData(const char* pszFileName, const char* psz return pData; } -void CCFileUtils::setResource(const char* pszZipFileName) -{ - CCAssert(0, "Have not implement!"); -} - int CCFileUtils::ccLoadFileIntoMemory(const char *filename, unsigned char **out) { CCAssert(0, "Have not implement!"); diff --git a/cocos2dx/platform/ios/CCFileUtils.mm b/cocos2dx/platform/ios/CCFileUtils.mm index 163c451816..a8d3a33962 100644 --- a/cocos2dx/platform/ios/CCFileUtils.mm +++ b/cocos2dx/platform/ios/CCFileUtils.mm @@ -475,10 +475,6 @@ unsigned char* CCFileUtils::getFileData(const char* pszFileName, const char* psz } return pBuffer; } -void CCFileUtils::setResource(const char* pszZipFileName) -{ - CCAssert(0, "Have not implement!"); -} // notification support when getFileData from a invalid file static bool s_bPopupNotify = true; diff --git a/cocos2dx/platform/win32/CCFileUtils.cpp b/cocos2dx/platform/win32/CCFileUtils.cpp index 7d582a701a..33a140424c 100644 --- a/cocos2dx/platform/win32/CCFileUtils.cpp +++ b/cocos2dx/platform/win32/CCFileUtils.cpp @@ -193,12 +193,6 @@ unsigned char* CCFileUtils::getFileData(const char* pszFileName, const char* psz return pBuffer; } -void CCFileUtils::setResource(const char* pszZipFileName) -{ - CC_UNUSED_PARAM(pszZipFileName); - CCAssert(0, "Have not implement!"); -} - string CCFileUtils::getWriteablePath() { // return the path that the exe file saved in