From 253a084e7b38a238f3395ceb42dd05a361caf2ff Mon Sep 17 00:00:00 2001
From: Dave Schuyler <nthparameter@gmail.com>
Date: Thu, 30 Jan 2003 04:20:08 +0000
Subject: [PATCH] *** empty log message ***

---
 panda/src/audio/audioSound.h              |  7 +++++--
 panda/src/audiotraits/milesAudioSound.cxx | 16 ++++++++--------
 panda/src/audiotraits/milesAudioSound.h   |  9 ++++++---
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/panda/src/audio/audioSound.h b/panda/src/audio/audioSound.h
index 4dce748392..a2530b2f01 100644
--- a/panda/src/audio/audioSound.h
+++ b/panda/src/audio/audioSound.h
@@ -32,7 +32,7 @@ class EXPCL_PANDA AudioSound : public ReferenceCount {
 PUBLISHED:
   virtual ~AudioSound() {}
   
-  // For best compatability, set the loop_count, start_time,
+  // For best compatability, set the loop_count,
   // volume, and balance, prior to calling play().  You may
   // set them while they're playing, but it's implementation
   // specific whether you get the results.
@@ -52,7 +52,10 @@ PUBLISHED:
   virtual void set_loop_count(unsigned long loop_count=1) = 0;
   virtual unsigned long get_loop_count() const = 0;
   
-  // start_time in seconds: 0 = beginning; length() = end.
+  // Control time position within the sound.
+  // This is similar (in concept) to the seek position within
+  // a file.
+  // time in seconds: 0 = beginning; length() = end.
   // inits to 0.0.
   // - Unlike the other get_* and set_* calls for a sound, the
   //   current time position will change while the sound is playing.
diff --git a/panda/src/audiotraits/milesAudioSound.cxx b/panda/src/audiotraits/milesAudioSound.cxx
index 933e82c7ad..9c0f54c841 100644
--- a/panda/src/audiotraits/milesAudioSound.cxx
+++ b/panda/src/audiotraits/milesAudioSound.cxx
@@ -167,18 +167,18 @@ get_loop_count() const {
 }
 
 void MilesAudioSound::
-set_time(float start_time) {
-  miles_audio_debug("set_time(start_time="<<start_time<<")");
-  S32 milisecond_start_time=S32(1000*start_time);
-  AIL_quick_set_ms_position(_audio, milisecond_start_time);
+set_time(float time) {
+  miles_audio_debug("set_time(time="<<time<<")");
+  S32 milisecond_time=S32(1000*time);
+  AIL_quick_set_ms_position(_audio, milisecond_time);
 }
 
 float MilesAudioSound::
 get_time() const {
-  S32 milisecond_start_time=AIL_quick_ms_position(_audio);
-  float start_time=float(milisecond_start_time*.001);
-  miles_audio_debug("get_time() returning "<<start_time);
-  return start_time;
+  S32 milisecond_time=AIL_quick_ms_position(_audio);
+  float time=float(milisecond_time*.001);
+  miles_audio_debug("get_time() returning "<<time);
+  return time;
 }
 
 void MilesAudioSound::
diff --git a/panda/src/audiotraits/milesAudioSound.h b/panda/src/audiotraits/milesAudioSound.h
index 5c6f532d3e..6e1d8c2d98 100644
--- a/panda/src/audiotraits/milesAudioSound.h
+++ b/panda/src/audiotraits/milesAudioSound.h
@@ -31,7 +31,7 @@ class EXPCL_MILES_AUDIO MilesAudioSound : public AudioSound {
 public:
   ~MilesAudioSound();
   
-  // For best compatability, set the loop_count, start_time,
+  // For best compatability, set the loop_count,
   // volume, and balance, prior to calling play().  You may
   // set them while they're playing, but it's implementation
   // specific whether you get the results.
@@ -51,7 +51,10 @@ public:
   void set_loop_count(unsigned long loop_count=1);
   unsigned long get_loop_count() const;
   
-  // start_time in seconds: 0 = beginning; length() = end.
+  // Control time position within the sound.
+  // This is similar (in concept) to the seek position within
+  // a file.
+  // time in seconds: 0 = beginning; length() = end.
   // inits to 0.0.
   // - Unlike the other get_* and set_* calls for a sound, the
   //   current time position will change while the sound is playing.
@@ -62,7 +65,7 @@ public:
   // - If a sound is playing, calling get_time() repeatedly will
   //   return different results over time.  e.g.:
   //   float percent_complete = s.get_time() / s.length();
-  void set_time(float start_time=0.0f);
+  void set_time(float time=0.0f);
   float get_time() const;
   
   // 0 = minimum; 1.0 = maximum.