summaryrefslogtreecommitdiff
path: root/src/rhlibrary/main.go
diff options
context:
space:
mode:
Diffstat (limited to 'src/rhlibrary/main.go')
-rw-r--r--src/rhlibrary/main.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rhlibrary/main.go b/src/rhlibrary/main.go
index 1f5fefd..b40ce9a 100644
--- a/src/rhlibrary/main.go
+++ b/src/rhlibrary/main.go
@@ -32,7 +32,7 @@ import (
"os"
"code.helsinki.at/rhrd-go/player"
- // "code.helsinki.at/rhrd-go/rddb"
+ "code.helsinki.at/rhrd-go/rddb"
"github.com/gotk3/gotk3/gtk"
)
@@ -79,12 +79,12 @@ func main() {
gtk.Init(nil)
- // db, err := rddb.NewDB(rdconf.Get().(string))
- // if err != nil {
- // rhl.Println("Error initializing Rivdenll DB:", err)
- // return
- // }
- // defer db.Cleanup()
+ db, err := rddb.NewDB(rdconf.Get().(string))
+ if err != nil {
+ rhl.Println("Error initializing Rivdenll DB:", err)
+ return
+ }
+ defer db.Cleanup()
p, err := player.NewPlayer("/home/equinox/helsinki/rivenhell/contrib/rhlibrary/snd", rhl, rhdl)
if err != nil {
@@ -92,7 +92,7 @@ func main() {
return
}
- mw, err := NewAppWindow(p.GetInterface(), 800, 600)
+ mw, err := NewAppWindow(db.GetInterface(), p.GetInterface(), 800, 600)
if err != nil {
rhl.Println("Error initializing Main Window:", err)
return