Skip to content

Commit

Permalink
comment out some work in progress to make today's release
Browse files Browse the repository at this point in the history
  • Loading branch information
dktr0 committed Nov 7, 2018
1 parent 93ad01e commit b5a33f8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ releaseClient: # make installClient or prodInstallClient first!

curlReleaseClient: # this uses curl to download and unzip a recent pre-built client from a GitHub release
rm -rf Estuary.jsexe
curl -o temp.zip -L https://github.com/d0kt0r0/estuary/releases/download/20181028/estuary-client-20181028.zip
curl -o temp.zip -L https://github.com/d0kt0r0/estuary/releases/download/20181107/estuary-client-20181107.zip
unzip temp.zip
rm -rf temp.zip
cp -Rf static/Dirt Estuary.jsexe
Expand Down
5 changes: 4 additions & 1 deletion client/src/Estuary/Tutorials/IntroTidalText.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import Estuary.Tidal.Types
introTidalText::MonadWidget t m => Tutorial t m
introTidalText = Tutorial IntroTidalText (const $ return (constDyn empty, never))

{-
miniTidalWidget :: MonadWidget t m => Int -> String -> m (Dynamic t (Int, Definition),Event t Hint)
miniTidalWidget index initial = do
Expand Down Expand Up @@ -67,7 +70,7 @@ miniTidalWidget index initial = do
widget::(Dynamic t Context -> m (Dynamic t DefinitionMap, Event t Hint))
widget::(Dynamic t Context -> m (Dynamic t DefinitionMap, Event t Hint)) -}
{- |
v1 :: Language -> (View, Definition)
v1 English = (LabelView 0, LabelText "Welcome to the introductory tutorial to Tidalcycles (or MiniTidal)")
Expand Down
4 changes: 2 additions & 2 deletions client/src/Estuary/Widgets/Sequencer.hs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ rowToGenPat' (val,pos) = Group (Live (fmap toAtom pos,Once) L4) Inert
parsed = maybe (maybe (Blank Inert) f $ readMaybe $ "\""++val++"\"") f $ readMaybe val
f x = Atom x Inert Once


{-
sequencer' ::MonadWidget t m => [(String, [Bool])] -> Event t [(String,[Bool])] -> m (Dynamic t ([(String,[Bool])], Event t [(String,[Bool])], Event t Hint))
sequencer' i update = do
let iVal = toGenPat $ fromList $ zip [0..] $ fmap (\(x,y)->(Just x,y)) i -- GeneralPattern String
Expand All @@ -94,7 +94,7 @@ sequencer' i update = do
mapDyn (\(v,ev,h) -> (toSequence 0 v, fmap (toSequence 0) $ getChangeValues ev,h)) v
where
getChangeValues eve = fmapMaybe $ fmap (\x-> case x of ChangeValue a -> Just a; otherwise-> Nothing) eve

-}

sequencer::(Read a, Ord a, MonadWidget t m, Show a, Eq a,T.Parseable a, T.Enumerable a) => Maybe a -> GeneralPattern a -> Event t (EditSignal (Sequence a)) -> m (Dynamic t (GeneralPattern a, Event t (EditSignal (GeneralPattern a)), Event t Hint))
sequencer dflt igp edits = elClass "table" "sequencer" $ mdo
Expand Down
2 changes: 1 addition & 1 deletion static/WebDirt

0 comments on commit b5a33f8

Please sign in to comment.