Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12099 from stari4ek/v3-12097-video-android-search-path 

Fixed: #12097 VideoPlayer on Android ignores search paths
This commit is contained in:
子龙山人 2015-06-08 17:22:14 +08:00
parent 54e23f15e6 b430353cd8
commit 57e92df8ee
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/ui/UIVideoPlayer-android.cpp
View File

@ -32,6 +32,7 @@
#include "jni/JniHelper.h"
#include "base/CCDirector.h"
#include "base/CCEventListenerKeyboard.h"
#include "platform/CCFileUtils.h"
//-----------------------------------------------------------------------------------------------------------
#define CLASS_NAME "org/cocos2dx/lib/Cocos2dxVideoHelper"
@ -193,7 +194,7 @@ VideoPlayer::~VideoPlayer()
void VideoPlayer::setFileName(const std::string& fileName)
{
_videoURL = fileName;
_videoURL = FileUtils::getInstance()->fullPathForFilename(fileName);
_videoSource = VideoPlayer::Source::FILENAME;
setVideoURLJNI(_videoPlayerIndex, (int)Source::FILENAME,_videoURL);
}

10
cocos/ui/UIVideoPlayer-ios.mm
View File

@ -55,7 +55,6 @@ using namespace cocos2d::experimental::ui;
-(void) videoFinished:(NSNotification*) notification;
-(void) playStateChange;
+(NSString*) fullPathFromRelativePath:(NSString*) relPath;
@end
@ -138,8 +137,7 @@ using namespace cocos2d::experimental::ui;
self.moviePlayer.movieSourceType = MPMovieSourceTypeStreaming;
[self.moviePlayer setContentURL:[NSURL URLWithString:@(videoUrl.c_str())]];
} else {
NSString *path = [UIVideoViewWrapperIos fullPathFromRelativePath:@(videoUrl.c_str())];
self.moviePlayer = [[[MPMoviePlayerController alloc] initWithContentURL:[NSURL fileURLWithPath:path]] autorelease];
self.moviePlayer = [[[MPMoviePlayerController alloc] initWithContentURL:[NSURL fileURLWithPath:@(videoUrl.c_str())]] autorelease];
self.moviePlayer.movieSourceType = MPMovieSourceTypeFile;
}
self.moviePlayer.allowsAirPlay = false;
@ -260,10 +258,6 @@ using namespace cocos2d::experimental::ui;
}
}
+(NSString*) fullPathFromRelativePath:(NSString*) relPath
{
return [NSString stringWithCString: cocos2d::FileUtils::getInstance()->fullPathForFilename(std::string([relPath UTF8String])).c_str() encoding: [NSString defaultCStringEncoding]];
}
@end
//------------------------------------------------------------------------------------------------------------
@ -293,7 +287,7 @@ VideoPlayer::~VideoPlayer()
void VideoPlayer::setFileName(const std::string& fileName)
{
_videoURL = fileName;
_videoURL = FileUtils::getInstance()->fullPathForFilename(fileName);
_videoSource = VideoPlayer::Source::FILENAME;
[((UIVideoViewWrapperIos*)_videoView) setURL:(int)_videoSource :_videoURL];
}