Changeset 0561c54

Timestamp:

Mar 24, 2017, 4:22:51 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, sampler

Children:

70ab9fe

Parents:

cc4987a (diff), 2615dd9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'aubiocmd'

Files:

• doc/aubio.txt (added)
• python/lib/aubio/cmd.py (added)
• python/lib/aubio/cut.py (moved) (moved from python/scripts/aubiocut) (4 diffs, 1 prop)
• setup.py (modified) (2 diffs)

python/lib/aubio/cut.py

@@ -7 +7 @@
 import sys
 
-usage = "usage: %s [options] -i soundfile" % sys.argv[0]
-usage += "\n help: %s -h" % sys.argv[0]
-
 def parse_args():
     from optparse import OptionParser
+    usage = "usage: %s [options] -i soundfile" % sys.argv[0]
+    usage += "\n help: %s -h" % sys.argv[0]
     parser = OptionParser(usage=usage)
     parser.add_option("-i", "--input", action = "store", dest = "source_file",
@@ -134 +133 @@
     (options, args) = parser.parse_args()
     if not options.source_file:
-        import os.path
         if len(args) == 1:
             options.source_file = args[0]
@@ -142 +140 @@
     return options, args
 
-if __name__ == '__main__':
+def main():
     options, args = parse_args()
 
@@ -150 +148 @@
     source_file = options.source_file
 
-    from aubio import onset, tempo, source, sink
+    from aubio import onset, tempo, source
 
     s = source(source_file, samplerate, hopsize)

setup.py

@@ -58 +58 @@
     packages = ['aubio'],
     package_dir = {'aubio':'python/lib/aubio'},
-    scripts = ['python/scripts/aubiocut'],
     ext_modules = [aubio_extension],
     description = 'a collection of tools for music analysis',
@@ -76 +75 @@
         'build_ext': build_ext,
         },
+    entry_points = {
+        'console_scripts': [
+            'aubio = aubio.cmd:main',
+            'aubiocut = aubio.cut:main',
+        ],
+    },
     test_suite = 'nose2.collector.collector',
     extras_require = {