Skip to content

Commit 11cead5

Browse files
authored
Merge branch 'master' into support_16kb
2 parents c4b5e6d + 3209797 commit 11cead5

File tree

24 files changed

+4942
-5755
lines changed

24 files changed

+4942
-5755
lines changed

flutter_vlc_player/CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
## 8.0.0
2-
* **Breaking Change**: bumped minimum Flutter SDK requirement to 3.22.0 and Dart SDK requirement to 3.4.0. The minimum supported Android version is now 5.0 (API level 21)
1+
## 7.4.3
2+
* Bumped minimum Flutter SDK requirement to 3.22.0 and Dart SDK requirement to 3.7.0. The minimum supported Android version is now 5.0 (API level 21)
33
* [Android] updated libvlc
44
* [Android] set Java compatibility to 11 instead of 8
55
* [ios] updated MobileVLCKit

flutter_vlc_player/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ android {
6262

6363
testLogging {
6464
events "passed", "skipped", "failed", "standardOut", "standardError"
65-
outputs.upToDateWhen {false}
65+
outputs.upToDateWhen { false }
6666
showStandardStreams = true
6767
}
6868
}
Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
11
package software.solid.fluttervlcplayer.Enums;
22

33
public enum DataSourceType {
4-
5-
ASSET(0),
6-
NETWORK(1),
7-
FILE(2);
8-
9-
private int mType;
10-
11-
DataSourceType (int type)
12-
{
13-
this.mType = type;
14-
}
15-
16-
public int getNumericType() {
17-
return mType;
18-
}
19-
4+
ASSET,
5+
NETWORK,
6+
FILE
207
}
Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
11
package software.solid.fluttervlcplayer.Enums;
22

33
public enum HwAcc {
4-
5-
AUTOMATIC(-1),
6-
DISABLED(0),
7-
DECODING(1),
8-
FULL(2);
9-
10-
private int mType;
11-
12-
HwAcc (int type)
13-
{
14-
this.mType = type;
15-
}
16-
17-
public int getNumericType() {
18-
return mType;
19-
}
4+
AUTOMATIC,
5+
DISABLED,
6+
DECODING,
7+
FULL
208
}

flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ void castToRenderer(String rendererDevice) {
567567
String getSnapshot() {
568568
if (textureView == null) return null;
569569
if (!mediaPlayer.isPlaying()) return null;
570+
570571
Bitmap bitmap = textureView.getBitmap();
571572
if (bitmap == null) return null;
572573

0 commit comments

Comments
 (0)