Skip to content

Commit

Permalink
v0.5.0.1, fixed a bug in reading beats.plist
Browse files Browse the repository at this point in the history
incorrectly converted the code from jelly...
  • Loading branch information
mtolly committed Jul 13, 2015
1 parent 709f679 commit a013200
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions jammittools.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: jammittools
Version: 0.5
Version: 0.5.0.1
Synopsis: Export sheet music and audio from Windows/Mac app Jammit
Description:

Expand Down Expand Up @@ -61,7 +61,7 @@ executable jammittools
, directory >= 1.2.0.1 && < 1.3
, filepath >= 1.3.0.1 && < 1.5
, boxes >= 0.1.3 && < 0.2
, jammittools == 0.5
, jammittools == 0.5.0.1
ghc-options: -Wall -O2

source-repository head
Expand Down
7 changes: 4 additions & 3 deletions src/Sound/Jammit/Base.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import Control.Applicative ((<$>))
import Control.Applicative ((<|>))
import Control.Monad (filterM, guard, forM)
import Data.Char (toLower)
import Data.Maybe (fromMaybe)
import System.Environment (lookupEnv)
import qualified Data.Map as Map
import qualified System.Directory as Dir
Expand Down Expand Up @@ -240,9 +241,9 @@ data Beat = Beat
instance PropertyListItem Beat where
fromPropertyList pl = do
dict <- fromPropertyList pl
isDownbeat <- fromLookup "isDownbeat" dict
isGhostBeat <- fromLookup "isGhostBeat" dict
position <- fromLookup "position" dict
let isDownbeat = fromMaybe False $ fromLookup "isDownbeat" dict
isGhostBeat = fromMaybe False $ fromLookup "isGhostBeat" dict
position <- fromLookup "position" dict
return Beat{..}

loadBeats :: FilePath -> IO (Maybe [Beat])
Expand Down
1 change: 1 addition & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ packages:
- location:
git: git@github.com:Twinside/HPDF
commit: 090c08ab61a237c721a307f5cf9fd33f3988b82e
extra-dep: true
extra-deps:
- boxes-0.1.4
- conduit-audio-0.1
Expand Down

0 comments on commit a013200

Please sign in to comment.