From b2398fd830443fa2930de0605d153b8a1264be95 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 13 Jan 2016 14:41:28 +0100 Subject: renamed rhrdlibrary to rhlibrary diff --git a/LICENSE b/LICENSE index 783c6a6..2ca30f4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,25 +1,25 @@ /* - * rhrdlibrary + * rhlibrary * * The Radio Helsinki Rivendell Library * * * Copyright (C) 2016 Christian Pointner * - * This file is part of rhrdlibrary. + * This file is part of rhlibrary. * - * rhrdlibrary is free software: you can redistribute it and/or modify + * rhlibrary 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. * - * rhrdlibrary is distributed in the hope that it will be useful, + * rhlibrary 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 rhrdlibrary. If not, see . + * along with rhlibrary. If not, see . */ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/Makefile b/Makefile index 33101d6..8e4d72e 100644 --- a/Makefile +++ b/Makefile @@ -1,31 +1,31 @@ ## -## rhrdlibrary +## rhlibrary ## ## The Radio Helsinki Rivendell Import Daemon ## ## ## Copyright (C) 2016 Christian Pointner ## -## This file is part of rhrdlibrary. +## This file is part of rhlibrary. ## -## rhrdlibrary is free software: you can redistribute it and/or modify +## rhlibrary 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. ## -## rhrdlibrary is distributed in the hope that it will be useful, +## rhlibrary 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 rhrdlibrary. If not, see . +## along with rhlibrary. If not, see . ## curdir:= $(shell pwd) GOCMD := GOPATH=$(curdir) go -EXECUTEABLE := rhrdlibrary +EXECUTEABLE := rhlibrary LIBS := "code.helsinki.at/rhrd-go/rddb" \ "github.com/ziutek/glib" \ diff --git a/src/rhlibrary/main.go b/src/rhlibrary/main.go new file mode 100644 index 0000000..85e5b8a --- /dev/null +++ b/src/rhlibrary/main.go @@ -0,0 +1,112 @@ +// +// rhlibrary +// +// The Radio Helsinki Rivendell Library +// +// +// Copyright (C) 2016 Christian Pointner +// +// This file is part of rhlibrary. +// +// rhlibrary 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. +// +// rhlibrary 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 rhlibrary. If not, see . +// + +package main + +import ( + "code.helsinki.at/rhrd-go/rddb" + "flag" + "fmt" + "io/ioutil" + "log" + "os" + "os/signal" + "sync" +) + +var ( + rhl = log.New(os.Stderr, "[rhlibrary]\t", log.LstdFlags) + rhdl = log.New(ioutil.Discard, "[rhlibrary-dbg]\t", log.LstdFlags) +) + +func init() { + // if _, exists := os.LookupEnv("RHRDLIBRARY_DEBUG"); exists { + rhdl.SetOutput(os.Stderr) + // } +} + +type envStringValue string + +func newEnvStringValue(key, dflt string) *envStringValue { + if envval, exists := os.LookupEnv(key); exists { + return (*envStringValue)(&envval) + } else { + return (*envStringValue)(&dflt) + } +} + +func (s *envStringValue) Set(val string) error { + *s = envStringValue(val) + return nil +} + +func (s *envStringValue) Get() interface{} { return string(*s) } + +func (s *envStringValue) String() string { return fmt.Sprintf("%s", *s) } + +func main() { + rdconf := newEnvStringValue("RHRDLIBRARY_RD_CONF", "/etc/rd.conf") + flag.Var(rdconf, "rdconf", "path to the Rivendell config file (environment: RHRDLIBRARY_RD_CONF)") + help := flag.Bool("help", false, "show usage") + + flag.Parse() + if *help { + flag.Usage() + return + } + + db, err := rddb.NewDB(rdconf.Get().(string)) + if err != nil { + rhl.Println("Error initializing Rivdenll DB:", err) + return + } + defer db.Cleanup() + + player, _ := NewPlayer("/home/equinox/helsinki/rivenhell/contrib/rhlibrary/snd") + + var wg sync.WaitGroup + + wg.Add(1) + go func() { + defer wg.Done() + player.Play(1, 1) + }() + + alldone := make(chan bool) + go func() { + defer func() { alldone <- true }() + wg.Wait() + }() + + c := make(chan os.Signal, 1) + signal.Notify(c, os.Interrupt) + + select { + case <-c: + rhl.Println("received interrupt, shutdown") + return + case <-alldone: + return + } +} diff --git a/src/rhlibrary/player.go b/src/rhlibrary/player.go new file mode 100644 index 0000000..3e4211c --- /dev/null +++ b/src/rhlibrary/player.go @@ -0,0 +1,73 @@ +// +// rhlibrary +// +// The Radio Helsinki Rivendell Library +// +// +// Copyright (C) 2016 Christian Pointner +// +// This file is part of rhlibrary. +// +// rhlibrary 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. +// +// rhlibrary 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 rhlibrary. If not, see . +// + +package main + +import ( + "fmt" + "github.com/revmischa/gst" + "github.com/ziutek/glib" + "path" +) + +type Player struct { + pipe *gst.Element + bus *gst.Bus + basepath string +} + +func (p *Player) onMessage(bus *gst.Bus, msg *gst.Message) { + switch msg.GetType() { + case gst.MESSAGE_EOS: + rhdl.Printf("EOS reached!") + p.pipe.SetState(gst.STATE_NULL) + case gst.MESSAGE_ERROR: + p.pipe.SetState(gst.STATE_NULL) + _, errstr := msg.ParseError() + rhdl.Printf("Error: %s\n", errstr) + } +} + +func (p *Player) Play(cart, cut uint) (err error) { + filename := path.Join(p.basepath, fmt.Sprintf("%06d_%03d.wav", cart, cut)) + rhdl.Printf("trying to play file: %s", filename) + + p.pipe.SetProperty("uri", "file://"+filename) + p.pipe.SetState(gst.STATE_PLAYING) + glib.NewMainLoop(nil).Run() + return +} + +func NewPlayer(basepath string) (p *Player, err error) { + p = &Player{} + p.basepath = path.Clean(basepath) + + p.pipe = gst.ElementFactoryMake("playbin", "autoplay") + p.bus = p.pipe.GetBus() + + p.bus.AddSignalWatch() + p.bus.Connect("message", (*Player).onMessage, p) + + return +} diff --git a/src/rhrdlibrary/main.go b/src/rhrdlibrary/main.go deleted file mode 100644 index 4209b8a..0000000 --- a/src/rhrdlibrary/main.go +++ /dev/null @@ -1,112 +0,0 @@ -// -// rhrdlibrary -// -// The Radio Helsinki Rivendell Library -// -// -// Copyright (C) 2016 Christian Pointner -// -// This file is part of rhrdlibrary. -// -// rhrdlibrary 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. -// -// rhrdlibrary 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 rhrdlibrary. If not, see . -// - -package main - -import ( - "code.helsinki.at/rhrd-go/rddb" - "flag" - "fmt" - "io/ioutil" - "log" - "os" - "os/signal" - "sync" -) - -var ( - rhl = log.New(os.Stderr, "[rhrdlibrary]\t", log.LstdFlags) - rhdl = log.New(ioutil.Discard, "[rhrdlibrary-dbg]\t", log.LstdFlags) -) - -func init() { - // if _, exists := os.LookupEnv("RHRDLIBRARY_DEBUG"); exists { - rhdl.SetOutput(os.Stderr) - // } -} - -type envStringValue string - -func newEnvStringValue(key, dflt string) *envStringValue { - if envval, exists := os.LookupEnv(key); exists { - return (*envStringValue)(&envval) - } else { - return (*envStringValue)(&dflt) - } -} - -func (s *envStringValue) Set(val string) error { - *s = envStringValue(val) - return nil -} - -func (s *envStringValue) Get() interface{} { return string(*s) } - -func (s *envStringValue) String() string { return fmt.Sprintf("%s", *s) } - -func main() { - rdconf := newEnvStringValue("RHRDLIBRARY_RD_CONF", "/etc/rd.conf") - flag.Var(rdconf, "rdconf", "path to the Rivendell config file (environment: RHRDLIBRARY_RD_CONF)") - help := flag.Bool("help", false, "show usage") - - flag.Parse() - if *help { - flag.Usage() - return - } - - db, err := rddb.NewDB(rdconf.Get().(string)) - if err != nil { - rhl.Println("Error initializing Rivdenll DB:", err) - return - } - defer db.Cleanup() - - player, _ := NewPlayer("/home/equinox/helsinki/rivenhell/contrib/rhrdlibrary/snd") - - var wg sync.WaitGroup - - wg.Add(1) - go func() { - defer wg.Done() - player.Play(1, 1) - }() - - alldone := make(chan bool) - go func() { - defer func() { alldone <- true }() - wg.Wait() - }() - - c := make(chan os.Signal, 1) - signal.Notify(c, os.Interrupt) - - select { - case <-c: - rhl.Println("received interrupt, shutdown") - return - case <-alldone: - return - } -} diff --git a/src/rhrdlibrary/player.go b/src/rhrdlibrary/player.go deleted file mode 100644 index 3463190..0000000 --- a/src/rhrdlibrary/player.go +++ /dev/null @@ -1,73 +0,0 @@ -// -// rhrdlibrary -// -// The Radio Helsinki Rivendell Library -// -// -// Copyright (C) 2016 Christian Pointner -// -// This file is part of rhrdlibrary. -// -// rhrdlibrary 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. -// -// rhrdlibrary 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 rhrdlibrary. If not, see . -// - -package main - -import ( - "fmt" - "github.com/revmischa/gst" - "github.com/ziutek/glib" - "path" -) - -type Player struct { - pipe *gst.Element - bus *gst.Bus - basepath string -} - -func (p *Player) onMessage(bus *gst.Bus, msg *gst.Message) { - switch msg.GetType() { - case gst.MESSAGE_EOS: - rhdl.Printf("EOS reached!") - p.pipe.SetState(gst.STATE_NULL) - case gst.MESSAGE_ERROR: - p.pipe.SetState(gst.STATE_NULL) - _, errstr := msg.ParseError() - rhdl.Printf("Error: %s\n", errstr) - } -} - -func (p *Player) Play(cart, cut uint) (err error) { - filename := path.Join(p.basepath, fmt.Sprintf("%06d_%03d.wav", cart, cut)) - rhdl.Printf("trying to play file: %s", filename) - - p.pipe.SetProperty("uri", "file://"+filename) - p.pipe.SetState(gst.STATE_PLAYING) - glib.NewMainLoop(nil).Run() - return -} - -func NewPlayer(basepath string) (p *Player, err error) { - p = &Player{} - p.basepath = path.Clean(basepath) - - p.pipe = gst.ElementFactoryMake("playbin", "autoplay") - p.bus = p.pipe.GetBus() - - p.bus.AddSignalWatch() - p.bus.Connect("message", (*Player).onMessage, p) - - return -} -- cgit v0.10.2