Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added VideoEditor reference to protected AudioTrack constructor"

Browse Source
This commit is contained in:
Gil Dobjanschi
2010-10-06 11:26:24 -07:00
committed by Android (Google) Code Review
parent e99b0b992a 0ca0a12c6b
commit ff61e8bea7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/videoeditor/AudioTrack.java
View File

@@ -236,6 +236,7 @@ public class AudioTrack {
/**
* Constructor
*
* @param editor The video editor reference
* @param audioTrackId The audio track id
* @param filename The audio filename
* @param startTimeMs the start time in milliseconds (relative to the
@@ -251,8 +252,9 @@ public class AudioTrack {
*
* @throws IOException if file is not found
*/
AudioTrack(String audioTrackId, String filename, long startTimeMs, long beginMs, long endMs,
boolean loop, int volume, boolean muted, String audioWaveformFilename) throws IOException {
AudioTrack(VideoEditor editor, String audioTrackId, String filename, long startTimeMs,
long beginMs, long endMs, boolean loop, int volume, boolean muted,
String audioWaveformFilename) throws IOException {
mUniqueId = audioTrackId;
mFilename = filename;
mStartTimeMs = startTimeMs;

2
media/java/android/media/videoeditor/VideoEditorTestImpl.java
View File

@@ -1017,7 +1017,7 @@ public class VideoEditorTestImpl implements VideoEditor {
final boolean loop = Boolean.parseBoolean(parser.getAttributeValue("", ATTR_LOOP));
final String waveformFilename = parser.getAttributeValue("", ATTR_AUDIO_WAVEFORM_FILENAME);
try {
final AudioTrack audioTrack = new AudioTrack(audioTrackId, filename, startTimeMs,
final AudioTrack audioTrack = new AudioTrack(this, audioTrackId, filename, startTimeMs,
beginMs, endMs, loop, volume, muted, waveformFilename);
return audioTrack;