Skip to content

Commit

Permalink
[UPDATE] readme
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinleeex committed Jun 23, 2019
1 parent 9a595a5 commit 83d9575
Show file tree
Hide file tree
Showing 9 changed files with 53 additions and 9 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

<div align="center"><img style="display:inline-block" width='150' src="./assets/DJbeat-logo.png"/><p>
<div align="center"><img style="display:inline-block" width='150' src="./assets/logo.png"/><p>
<span style="font-size: 14px">Version: 0.4.6</span><br>
<span>"A Simple Beat Time Marks Generator"</span><br>
<span style="font-size: 12px;color= #95dafc">-- Created by <a>Kevin T. Lee</a> --</span>
</p>
<a href="./LICENSE"><img alt="MIT" src="https://img.shields.io/github/license/mashape/apistatus.svg?&url=LICENSE&longCache=true&style=for-the-badge"></a>
<a href="http://lidengju.com"><img alt="Code" src="https://img.shields.io/badge/Code%20with-Love-red.svg?longCache=true&style=for-the-badge"></a>
<a href="https://github.com/kevinleeex/dj-beat/"><img alt="Version" src="https://img.shields.io/badge/Version-0.4.1-blue.svg?longCache=true&style=for-the-badge"></a>
<a href="https://github.com/kevinleeex/dj-beat/"><img alt="Version" src="https://img.shields.io/badge/Version-0.4.6-blue.svg?longCache=true&style=for-the-badge"></a>
</div>

# DJ-beat
Expand Down Expand Up @@ -73,7 +73,9 @@ $ djbeat -f ./test/treasure-trimed.wav -r 30
#### Arguments

```
-h, --help show this help message and exit.
-h, --help Display this help message and exit.
-v, Display the version.
-V, Display the beat time list in terminal.
-p, --platform The platform, fcpx or pre, default='fcpx'.
-f, --filepath The filepath of the input audio.
-s, --fps FPS The sample rate of the music, a integer number, default='100'.
Expand Down
Binary file removed assets/DJbeat-logo.png
Binary file not shown.
Binary file added assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions djbeat/djbeat.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# author: Kevin T. Lee<[email protected]>
# description: DJ-beat is available to detect the beat from the audio and generate time marks for FCPX and premiere.

__version__ = '0.4.6'
__version__ = '0.4.7'

import madmom
import librosa
Expand All @@ -14,6 +14,7 @@
from tqdm import tqdm
from pyfiglet import Figlet
from string import Template
from urllib.request import pathname2url


class DJbeat(object):
Expand Down Expand Up @@ -79,7 +80,7 @@ def gen_fcpxml(self):
'date_time': self.date_time,
'frame_rate': self.frame_rate,
'file_name': self.file_name,
'file_path': self.abs_filepath,
'file_path': pathname2url(self.abs_filepath),
'file_length': self.file_length,
'file_real_length': self.file_real_length,
'audio_sr': self.audio_sr,
Expand Down
1 change: 1 addition & 0 deletions djbeat/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ tqdm==4.31.1
madmom==0.16.1
librosa==0.6.3
pyfiglet==0.8.post1
urllib3==1.23
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
entry_points={
"console_scripts": ['djbeat = djbeat.djbeat:main']
},
version='0.4.6',
version='0.4.7',
description="A simple CLI tool for generating beat marks of music for FCPX and PRE",
license="MIT",
install_requires=[
Expand All @@ -24,7 +24,8 @@
'tqdm',
'madmom',
'librosa',
'pyfiglet'
'pyfiglet',
'urllib3'
],
# long_description=long_descr,
include_package_data=True,
Expand Down
4 changes: 2 additions & 2 deletions test/treasure-trimed.wav.fcpxml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<!DOCTYPE fcpxml>

<!-- DJ-beat @2019 Kevin T. Lee - Build Version: 0.4.6 -->
<!-- Build Date Time: 2019-06-21 13:20 -->
<!-- Build Date Time: 2019-06-23 11:57 -->

<fcpxml version="1.6">
<resources>
<format id='k1' name='FFVideoFormat1080p30' frameDuration='1/30s'/>
<asset id="k2" name="treasure-trimed" src="file:/Users/kevin/Projects/GitHub/dj-beat/test/treasure-trimed.wav" start='0/1000s' duration='5476/1000s' hasAudio="1" audioSources="1" audioRate="22050">
<asset id="k2" name="treasure-trimed" src="file:b'/Users/kevin/Projects/GitHub/dj-beat/test/treasure-trimed.wav'" start='0/1000s' duration='5476/1000s' hasAudio="1" audioSources="1" audioRate="22050">
</asset>
</resources>
<library>
Expand Down
Binary file added test/中文 测试.wav
Binary file not shown.
39 changes: 39 additions & 0 deletions test/中文 测试.wav.fcpxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fcpxml>

<!-- DJ-beat @2019 Kevin T. Lee - Build Version: 0.4.6 -->
<!-- Build Date Time: 2019-06-23 12:04 -->

<fcpxml version="1.6">
<resources>
<format id='k1' name='FFVideoFormat1080p30' frameDuration='1/30s'/>
<asset id="k2" name="中文 测试" src="file:/Users/kevin/Projects/GitHub/dj-beat/test/%E4%B8%AD%E6%96%87%20%E6%B5%8B%E8%AF%95.wav" start='0/1000s' duration='5476/1000s' hasAudio="1" audioSources="1" audioRate="22050">
</asset>
</resources>
<library>
<event name="中文 测试 Event">
<project name="中文 测试 Project">
<sequence duration='5000/1000s' format="k1" tcStart="0s" tcFormat="NDF" audioLayout="stereo" audioRate="48k">
<spine>
<asset-clip name='中文 测试' lane='0' offset='0/1000s' ref='k2' duration='5000/1000s' audioRole='Music'>
<marker start='7/30s' duration='1/48000s' value='beat_at_0.25' completed='0'/>
<marker start='23/30s' duration='1/48000s' value='beat_at_0.77' completed='0'/>
<marker start='38/30s' duration='1/48000s' value='beat_at_1.28' completed='0'/>
<marker start='54/30s' duration='1/48000s' value='beat_at_1.8' completed='0'/>
<marker start='69/30s' duration='1/48000s' value='beat_at_2.32' completed='0'/>
<marker start='85/30s' duration='1/48000s' value='beat_at_2.84' completed='0'/>
<marker start='100/30s' duration='1/48000s' value='beat_at_3.35' completed='0'/>
<marker start='116/30s' duration='1/48000s' value='beat_at_3.87' completed='0'/>
<marker start='131/30s' duration='1/48000s' value='beat_at_4.39' completed='0'/>
<marker start='147/30s' duration='1/48000s' value='beat_at_4.91' completed='0'/>
<marker start='162/30s' duration='1/48000s' value='beat_at_5.42' completed='0'/>

<audio-channel-source role='music.music-1' srcCh='1, 2'/>
</asset-clip>

</spine>
</sequence>
</project>
</event>
</library>
</fcpxml>

0 comments on commit 83d9575

Please sign in to comment.