[Python-modules-commits] [audioread] 01/03: Import audioread_2.1.4.orig.tar.gz

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository audioread.

commit 294886a90f3f985f5f817a21bbbf1bc539b4266c
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Mon Jul 4 00:11:01 2016 +0200

    Import audioread_2.1.4.orig.tar.gz
---
 PKG-INFO            | 14 +++++++++++---
 README.rst          | 12 ++++++++++--
 audioread/ffdec.py  |  7 ++++++-
 audioread/gstdec.py |  5 ++---
 setup.py            |  2 +-
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index d741e99..396a5b2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: audioread
-Version: 2.1.2
+Version: 2.1.4
 Summary: multi-library, cross-platform audio decoding
 Home-page: https://github.com/sampsyo/audioread
 Author: Adrian Sampson
@@ -9,8 +9,8 @@ License: MIT
 Description: audioread
         =========
         
-        .. image:: https://secure.travis-ci.org/sampsyo/audioread.png
-                :target: https://travis-ci.org/sampsyo/audioread/
+        .. image:: https://secure.travis-ci.org/beetbox/audioread.png
+                :target: https://travis-ci.org/beetbox/audioread/
         
         Decode audio files using whichever backend is available. The library
         currently supports:
@@ -73,6 +73,14 @@ Description: audioread
         Version History
         ---------------
         
+        2.1.4
+          Fix a bug in the FFmpeg backend where, after closing a file, the program's
+          standard input stream would be "broken" and wouldn't receive any input.
+        
+        2.1.3
+          Avoid some warnings in the GStreamer backend when using modern versions of
+          GLib. We now require at least GLib 2.32.
+        
         2.1.2
           Fix a file descriptor leak when opening and closing many files using
           GStreamer.
diff --git a/README.rst b/README.rst
index b791c2f..0c968d7 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,8 @@
 audioread
 =========
 
-.. image:: https://secure.travis-ci.org/sampsyo/audioread.png
-        :target: https://travis-ci.org/sampsyo/audioread/
+.. image:: https://secure.travis-ci.org/beetbox/audioread.png
+        :target: https://travis-ci.org/beetbox/audioread/
 
 Decode audio files using whichever backend is available. The library
 currently supports:
@@ -65,6 +65,14 @@ convert compressed audio files to WAV files.
 Version History
 ---------------
 
+2.1.4
+  Fix a bug in the FFmpeg backend where, after closing a file, the program's
+  standard input stream would be "broken" and wouldn't receive any input.
+
+2.1.3
+  Avoid some warnings in the GStreamer backend when using modern versions of
+  GLib. We now require at least GLib 2.32.
+
 2.1.2
   Fix a file descriptor leak when opening and closing many files using
   GStreamer.
diff --git a/audioread/ffdec.py b/audioread/ffdec.py
index b6e0c4f..622f31d 100644
--- a/audioread/ffdec.py
+++ b/audioread/ffdec.py
@@ -21,6 +21,7 @@ import subprocess
 import re
 import threading
 import time
+import os
 try:
     import queue
 except ImportError:
@@ -117,10 +118,13 @@ class FFmpegAudioFile(object):
             )
 
         try:
+            self.devnull = open(os.devnull)
             self.proc = popen_multiple(
                 COMMANDS,
                 ['-i', filename, '-f', 's16le', '-'],
-                stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                stdin=self.devnull,
             )
 
         except OSError:
@@ -258,6 +262,7 @@ class FFmpegAudioFile(object):
         if hasattr(self, 'proc') and self.proc.returncode is None:
             self.proc.kill()
             self.proc.wait()
+            self.devnull.close()
 
     def __del__(self):
         self.close()
diff --git a/audioread/gstdec.py b/audioread/gstdec.py
index c647a34..8dff193 100644
--- a/audioread/gstdec.py
+++ b/audioread/gstdec.py
@@ -50,7 +50,7 @@ from __future__ import division
 
 import gi
 gi.require_version('Gst', '1.0')
-from gi.repository import GObject, Gst
+from gi.repository import GLib, Gst
 
 import sys
 import threading
@@ -123,7 +123,6 @@ class IncompleteGStreamerError(GStreamerError):
 _shared_loop_thread = None
 _loop_thread_lock = threading.RLock()
 
-GObject.threads_init()
 Gst.init(None)
 
 def get_loop_thread():
@@ -143,7 +142,7 @@ class MainLoopThread(threading.Thread):
     """
     def __init__(self):
         super(MainLoopThread, self).__init__()
-        self.loop = GObject.MainLoop()
+        self.loop = GLib.MainLoop()
         self.daemon = True
 
     def run(self):
diff --git a/setup.py b/setup.py
index 6efe556..1d3aa58 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def _read(fn):
 
 
 setup(name='audioread',
-      version='2.1.2',
+      version='2.1.4',
       description='multi-library, cross-platform audio decoding',
       author='Adrian Sampson',
       author_email='adrian at radbox.org',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/audioread.git