Skip to content

Commit fc09669

Browse files
committed
remove ijkplayer-exo from ijkplayer-view
1 parent f296e1f commit fc09669

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

android/ijkplayer/ijkplayer-example/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,10 @@ dependencies {
8585
compile 'com.squareup:otto:1.3.8'
8686

8787
compile project(':ijkplayer-java')
88-
compile project(':ijkplayer-exo')
8988

9089
if (isModuleAsApp.toBoolean()) {
90+
compile project(':ijkplayer-exo')
91+
9192
all32Compile project(':ijkplayer-armv5')
9293
all32Compile project(':ijkplayer-armv7a')
9394
all32Compile project(':ijkplayer-x86')

android/ijkplayer/ijkplayer-example/src/main/java/tv/danmaku/ijk/media/example/widget/media/IjkVideoView.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import tv.danmaku.ijk.media.example.R;
5050
import tv.danmaku.ijk.media.example.application.Settings;
5151
import tv.danmaku.ijk.media.example.services.MediaPlayerService;
52-
import tv.danmaku.ijk.media.exo.IjkExoMediaPlayer;
5352
import tv.danmaku.ijk.media.player.AndroidMediaPlayer;
5453
import tv.danmaku.ijk.media.player.IMediaPlayer;
5554
import tv.danmaku.ijk.media.player.IjkMediaPlayer;
@@ -1021,8 +1020,11 @@ public IMediaPlayer createPlayer(int playerType) {
10211020

10221021
switch (playerType) {
10231022
case Settings.PV_PLAYER__IjkExoMediaPlayer: {
1024-
IjkExoMediaPlayer IjkExoMediaPlayer = new IjkExoMediaPlayer(mAppContext);
1025-
mediaPlayer = IjkExoMediaPlayer;
1023+
try {
1024+
mediaPlayer = (IMediaPlayer) Class.forName("tv.danmaku.ijk.media.exo.IjkExoMediaPlayer").getConstructor(Context.class).newInstance(mAppContext);
1025+
} catch (Exception e) {
1026+
throw new RuntimeException("create IjkExoMediaPlayer failed.", e);
1027+
}
10261028
}
10271029
break;
10281030
case Settings.PV_PLAYER__AndroidMediaPlayer: {

android/ijkplayer/tools/gradle-publish-local.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.github.dcendents.android-maven'
22

33
group = 'cn.transcodegroup.ijkplayer'
4-
version = "$VERSION_NAME.9"
4+
version = "$VERSION_NAME.10"
55

66
task androidJavadocs(type: Javadoc) {
77
failOnError false

0 commit comments

Comments
 (0)