mirror of https://github.com/axmolengine/axmol.git
fixed #1203, remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone.
This commit is contained in:
parent
2223cbcd69
commit
2addd06f21
|
@ -54,11 +54,6 @@ void SimpleAudioEngine::end()
|
||||||
endJNI();
|
endJNI();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SimpleAudioEngine::setResource(const char* pszZipFileName)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath)
|
void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath)
|
||||||
{
|
{
|
||||||
preloadBackgroundMusicJNI(pszFilePath);
|
preloadBackgroundMusicJNI(pszFilePath);
|
||||||
|
|
|
@ -295,11 +295,6 @@ void SimpleAudioEngine::end()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SimpleAudioEngine::setResource(const char* pszZipFileName)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath)
|
void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath)
|
||||||
{
|
{
|
||||||
openMediaPlayer(s_pBackPlayer, pszFilePath);
|
openMediaPlayer(s_pBackPlayer, pszFilePath);
|
||||||
|
|
|
@ -52,12 +52,6 @@ public:
|
||||||
*/
|
*/
|
||||||
static void end();
|
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
|
@brief Preload background music
|
||||||
@param pszFilePath The path of the background music file,or the FileName of T_SoundResInfo
|
@param pszFilePath The path of the background music file,or the FileName of T_SoundResInfo
|
||||||
|
|
|
@ -172,11 +172,6 @@ void SimpleAudioEngine::end()
|
||||||
static_end();
|
static_end();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SimpleAudioEngine::setResource(const char* pszZipFileName)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath)
|
void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath)
|
||||||
{
|
{
|
||||||
static_preloadBackgroundMusic(pszFilePath);
|
static_preloadBackgroundMusic(pszFilePath);
|
||||||
|
|
|
@ -33,9 +33,6 @@ void SimpleAudioEngine::end() {
|
||||||
// return;
|
// return;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SimpleAudioEngine::setResource(const char* pszZipFileName) {
|
|
||||||
}
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
// BackgroundMusic
|
// BackgroundMusic
|
||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
|
|
|
@ -95,11 +95,6 @@ namespace CocosDenshion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SimpleAudioEngine::setResource(const char* pszZipFileName)
|
|
||||||
{
|
|
||||||
// todo
|
|
||||||
}
|
|
||||||
|
|
||||||
void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath)
|
void SimpleAudioEngine::preloadBackgroundMusic(const char* pszFilePath)
|
||||||
{
|
{
|
||||||
s3eFile *fileHandle = s3eFileOpen(pszFilePath, "rb");
|
s3eFile *fileHandle = s3eFileOpen(pszFilePath, "rb");
|
||||||
|
|
|
@ -158,10 +158,6 @@ namespace CocosDenshion
|
||||||
stopBackground(true);
|
stopBackground(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SimpleAudioEngine::setResource(const char* pszZipFileName)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// OGG support
|
// OGG support
|
||||||
//
|
//
|
||||||
|
|
|
@ -62,10 +62,6 @@ void SimpleAudioEngine::end()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SimpleAudioEngine::setResource(const char* pszZipFileName)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
// BackgroundMusic
|
// BackgroundMusic
|
||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
|
|
|
@ -157,15 +157,6 @@ public:
|
||||||
static void setIsPopupNotify(bool bNotify);
|
static void setIsPopupNotify(bool bNotify);
|
||||||
static bool getIsPopupNotify();
|
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
|
// interfaces on ios
|
||||||
///////////////////////////////////////////////////
|
///////////////////////////////////////////////////
|
||||||
|
|
|
@ -118,11 +118,6 @@ unsigned char* CCFileUtils::getFileData(const char* pszFileName, const char* psz
|
||||||
return pData;
|
return pData;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CCFileUtils::setResource(const char* pszZipFileName)
|
|
||||||
{
|
|
||||||
CCAssert(0, "Have not implement!");
|
|
||||||
}
|
|
||||||
|
|
||||||
int CCFileUtils::ccLoadFileIntoMemory(const char *filename, unsigned char **out)
|
int CCFileUtils::ccLoadFileIntoMemory(const char *filename, unsigned char **out)
|
||||||
{
|
{
|
||||||
CCAssert(0, "Have not implement!");
|
CCAssert(0, "Have not implement!");
|
||||||
|
|
|
@ -475,10 +475,6 @@ unsigned char* CCFileUtils::getFileData(const char* pszFileName, const char* psz
|
||||||
}
|
}
|
||||||
return pBuffer;
|
return pBuffer;
|
||||||
}
|
}
|
||||||
void CCFileUtils::setResource(const char* pszZipFileName)
|
|
||||||
{
|
|
||||||
CCAssert(0, "Have not implement!");
|
|
||||||
}
|
|
||||||
|
|
||||||
// notification support when getFileData from a invalid file
|
// notification support when getFileData from a invalid file
|
||||||
static bool s_bPopupNotify = true;
|
static bool s_bPopupNotify = true;
|
||||||
|
|
|
@ -193,12 +193,6 @@ unsigned char* CCFileUtils::getFileData(const char* pszFileName, const char* psz
|
||||||
return pBuffer;
|
return pBuffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CCFileUtils::setResource(const char* pszZipFileName)
|
|
||||||
{
|
|
||||||
CC_UNUSED_PARAM(pszZipFileName);
|
|
||||||
CCAssert(0, "Have not implement!");
|
|
||||||
}
|
|
||||||
|
|
||||||
string CCFileUtils::getWriteablePath()
|
string CCFileUtils::getWriteablePath()
|
||||||
{
|
{
|
||||||
// return the path that the exe file saved in
|
// return the path that the exe file saved in
|
||||||
|
|
Loading…
Reference in New Issue