manatee-mplayer 0.0.2 → 0.0.3

raw patch · 4 files changed

+33/−7 lines, 4 filesdep ~manatee-coresetup-changed

Dependency ranges changed: manatee-core

Files

• Main.hs +2/−1
• Manatee/Extension/Mplayer/PlaylistBuffer.hs +2/−4
• Setup.hs +18/−0
• manatee-mplayer.cabal +11/−2

@@ -28,4 +28,5 @@ -- | Irc client render process. main :: IO () main = -    startupRender (\ pagePath client pageId -> PageBufferWrap <$> playlistBufferNew pagePath client pageId)+    startupRender (\ pagePath options client pageId -> +                       PageBufferWrap <$> playlistBufferNew pagePath options client pageId)

@@ -46,8 +46,6 @@ import System.Posix.Process import Text.Regex.TDFA -import qualified Data.Map as M- data PlaylistBuffer =     PlaylistBuffer {playlistBufferName                  :: TVar String                    ,playlistBufferClient                :: Client@@ -160,8 +158,8 @@ -- | New playlist buffer. -- If path is directory, will search multimedia files with given directory. -- If path is multimedia file, then add to play list.-playlistBufferNew :: FilePath -> Client -> PageId -> IO PlaylistBuffer-playlistBufferNew path client pageId = do+playlistBufferNew :: FilePath -> [String] -> Client -> PageId -> IO PlaylistBuffer+playlistBufferNew path _ client pageId = do   -- Get multimedia info list.   infos <- playlistBufferGenerateInfos path 

@@ -1,3 +1,21 @@+-- Author:     Andy Stewart <lazycat.manatee@gmail.com>+-- Maintainer: Andy Stewart <lazycat.manatee@gmail.com>+-- +-- Copyright (C) 2010 Andy Stewart, all rights reserved.+-- +-- This program is free software: you can redistribute it and/or modify+-- it under the terms of the GNU General Public License as published by+-- the Free Software Foundation, either version 3 of the License, or+-- any later version.+-- +-- This program is distributed in the hope that it will be useful,+-- but WITHOUT ANY WARRANTY; without even the implied warranty of+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the+-- GNU General Public License for more details.+-- +-- You should have received a copy of the GNU General Public License+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.+ import Distribution.Simple import Manatee.Core.Config import Manatee.Core.Types

@@ -1,11 +1,20 @@ name:			manatee-mplayer-version:		0.0.2+version:		0.0.3 Cabal-Version:	>= 1.6 license:		GPL-3 license-file:	LICENSE copyright:		(c) 2009 ~ 2010 Andy Stewart synopsis:		Mplayer client extension for Manatee. description:    manatee-mplayer is mplayer client extension for Manatee (Haskell/Gtk+ Integrated Live Environment)+ .+ Manual look <http://haskell.org/haskellwiki/Manatee>+ .+ Screenshot at <http://goo.gl/MkVw>+ .+ IRC channel: + .+ irc.freenode.net 6667 <##manatee>+ . author:			Andy Stewart maintainer:		Andy Stewart <lazycat.manatee@gmail.com> stability:		provisional@@ -19,7 +28,7 @@   location:     http://patch-tag.com/r/AndyStewart/manatee-mplayer    Library-     build-depends: base >= 4 && < 5, manatee-core >= 0.0.2, dbus-client >= 0.3 && < 0.4, stm >= 2.1.2.0,+     build-depends: base >= 4 && < 5, manatee-core >= 0.0.3, dbus-client >= 0.3 && < 0.4, stm >= 2.1.2.0,                     containers >= 0.3.0.0, gtk-serialized-event >= 0.12.0, gtk >= 0.12.0,                      text >= 0.7.1.0, bytestring >= 0.9.1.5, libtagc >= 0.12.0, regex-tdfa >= 1.1.2,                     filepath >= 1.1.0.3, utf8-string >= 0.3.4, time, dbus-core, gio >= 0.12.0,