Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Casanowow Life for love
VLC-Android
Commits
b74887c6
Commit
b74887c6
authored
Mar 16, 2018
by
Geoffrey Métais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Video player: Hide debug logs from release
parent
c32f99fa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
...d/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+5
-6
No files found.
vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
View file @
b74887c6
...
...
@@ -684,7 +684,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
String
subtitleList_serialized
=
null
;
synchronized
(
mSubtitleSelectedFiles
)
{
if
(
mSubtitleSelectedFiles
.
size
()
>
0
)
{
Log
.
d
(
TAG
,
"Saving selected subtitle files"
);
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
"Saving selected subtitle files"
);
ByteArrayOutputStream
bos
=
new
ByteArrayOutputStream
();
try
{
ObjectOutputStream
oos
=
new
ObjectOutputStream
(
bos
);
...
...
@@ -874,7 +874,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
vlcVout
.
removeCallback
(
this
);
vlcVout
.
detachViews
();
if
(
mService
.
hasMedia
()
&&
mSwitchingView
)
{
Log
.
d
(
TAG
,
"mLocation = \""
+
mUri
+
"\""
);
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
"mLocation = \""
+
mUri
+
"\""
);
if
(
mSwitchToPopup
)
mService
.
switchToPopup
(
mService
.
getCurrentMediaPosition
());
else
{
...
...
@@ -931,8 +931,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
MediaDatabase
.
getInstance
().
saveSlave
(
mService
.
getCurrentMediaLocation
(),
Media
.
Slave
.
Type
.
Subtitle
,
2
,
data
.
getStringExtra
(
FilePickerFragment
.
EXTRA_MRL
));
}
});
}
else
Log
.
d
(
TAG
,
"Subtitle selection dialog was cancelled"
);
}
else
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
"Subtitle selection dialog was cancelled"
);
}
public
static
void
start
(
Context
context
,
Uri
uri
)
{
...
...
@@ -3077,7 +3076,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
final
KeyguardManager
km
=
(
KeyguardManager
)
getApplicationContext
().
getSystemService
(
KEYGUARD_SERVICE
);
if
(
km
!=
null
&&
km
.
inKeyguardRestrictedInputMode
())
mWasPaused
=
true
;
if
(
mWasPaused
)
if
(
mWasPaused
&&
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
"Video was previously paused, resuming in paused mode"
);
if
(
intent
.
getData
()
!=
null
)
mUri
=
intent
.
getData
();
...
...
@@ -3108,7 +3107,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
final
boolean
continueplayback
=
isPlaying
&&
(
restorePlayback
||
positionInPlaylist
==
mService
.
getCurrentMediaPosition
());
if
(
resumePlaylist
)
{
// Provided externally from AudioService
Log
.
d
(
TAG
,
"Continuing playback from PlaybackService at index "
+
positionInPlaylist
);
if
(
BuildConfig
.
DEBUG
)
Log
.
d
(
TAG
,
"Continuing playback from PlaybackService at index "
+
positionInPlaylist
);
openedMedia
=
mService
.
getMedias
().
get
(
positionInPlaylist
);
if
(
openedMedia
==
null
)
{
encounteredError
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment