From 026c2bf619b07a3643ec18e1125efdf8e35987a8 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 29 Apr 2019 17:49:02 +0200
Subject: [PATCH] movies: UserDataAudio.read_samples should take a
 bytes/vector_uchar

---
 panda/src/movies/userDataAudio.cxx | 4 ++--
 panda/src/movies/userDataAudio.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/panda/src/movies/userDataAudio.cxx b/panda/src/movies/userDataAudio.cxx
index f02726d10b..4022b6b7f3 100644
--- a/panda/src/movies/userDataAudio.cxx
+++ b/panda/src/movies/userDataAudio.cxx
@@ -107,11 +107,11 @@ append(DatagramIterator *src, int n) {
  * but it may be convenient to deal with samples in python.
  */
 void UserDataAudio::
-append(const std::string &str) {
+append(const vector_uchar &str) {
   nassertv(!_aborted);
   int samples = str.size() / (2 * _desired_channels);
   int words = samples * _desired_channels;
-  for (int i=0; i<words; i++) {
+  for (int i = 0; i < words; ++i) {
     int c1 = ((unsigned char)str[i*2+0]);
     int c2 = ((unsigned char)str[i*2+1]);
     int16_t n = (c1 | (c2 << 8));
diff --git a/panda/src/movies/userDataAudio.h b/panda/src/movies/userDataAudio.h
index c37831b17b..3901031fcb 100644
--- a/panda/src/movies/userDataAudio.h
+++ b/panda/src/movies/userDataAudio.h
@@ -37,7 +37,7 @@ class EXPCL_PANDA_MOVIES UserDataAudio : public MovieAudio {
 
   void append(int16_t *data, int n);
   void append(DatagramIterator *src, int len=0x40000000);
-  void append(const std::string &str);
+  void append(const vector_uchar &);
   void done(); // A promise not to write any more samples.
 
  private: