From 0ca0a12c6b49032065bf64e9f1cdebf765a0df9d Mon Sep 17 00:00:00 2001
From: Gil Dobjanschi <virgild@google.com>
Date: Wed, 6 Oct 2010 10:53:49 -0700
Subject: [PATCH] Added VideoEditor reference to protected AudioTrack
 constructor

Change-Id: Icfac392f8060d424b27105c6ae718e35b2d6c705
---
 media/java/android/media/videoeditor/AudioTrack.java        | 6 ++++--
 .../java/android/media/videoeditor/VideoEditorTestImpl.java | 2 +-
 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 6007d757b6be9..3ebad00fbaffb 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 b188d410bdf45..c3cb82ac106be 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;