summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorGil Dobjanschi <virgild@google.com>2010-10-06 10:53:49 -0700
committerGil Dobjanschi <virgild@google.com>2010-10-06 10:53:49 -0700
commit0ca0a12c6b49032065bf64e9f1cdebf765a0df9d (patch)
treea6b8f2629a0fb70e4a382b3bfde6aef423e007e1 /media/java
parentf62bedc5c0e463a546eed8b72bf9ea8ca72f03c0 (diff)
downloadframeworks_base-0ca0a12c6b49032065bf64e9f1cdebf765a0df9d.zip
frameworks_base-0ca0a12c6b49032065bf64e9f1cdebf765a0df9d.tar.gz
frameworks_base-0ca0a12c6b49032065bf64e9f1cdebf765a0df9d.tar.bz2
Added VideoEditor reference to protected AudioTrack constructor
Change-Id: Icfac392f8060d424b27105c6ae718e35b2d6c705
Diffstat (limited to 'media/java')
-rwxr-xr-xmedia/java/android/media/videoeditor/AudioTrack.java6
-rw-r--r--media/java/android/media/videoeditor/VideoEditorTestImpl.java2
2 files changed, 5 insertions, 3 deletions
diff --git a/media/java/android/media/videoeditor/AudioTrack.java b/media/java/android/media/videoeditor/AudioTrack.java
index 6007d75..3ebad00 100755
--- a/media/java/android/media/videoeditor/AudioTrack.java
+++ b/media/java/android/media/videoeditor/AudioTrack.java
@@ -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;
diff --git a/media/java/android/media/videoeditor/VideoEditorTestImpl.java b/media/java/android/media/videoeditor/VideoEditorTestImpl.java
index b188d41..c3cb82a 100644
--- a/media/java/android/media/videoeditor/VideoEditorTestImpl.java
+++ b/media/java/android/media/videoeditor/VideoEditorTestImpl.java
@@ -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;