diff options
| author | Christian Pointner <equinox@helsinki.at> | 2016-01-13 20:18:45 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2016-01-13 20:18:45 (GMT) |
| commit | b0bcbd4e25febd4bfaa445a259c5034dd687ba26 (patch) | |
| tree | 7ac006504642b3ba837d61d28ac30e950e80dadc /src/rhlibrary/main.go | |
| parent | ecfe71e1a703e7c3a2b1f35bf3639f0f6a155bc5 (diff) | |
mainwindow now handles player directly
Diffstat (limited to 'src/rhlibrary/main.go')
| -rw-r--r-- | src/rhlibrary/main.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/rhlibrary/main.go b/src/rhlibrary/main.go index 45c443f..1676c18 100644 --- a/src/rhlibrary/main.go +++ b/src/rhlibrary/main.go @@ -84,16 +84,13 @@ func main() { } defer db.Cleanup() - p, err := player.NewPlayer("/home/equinox/helsinki/rivenhell/contrib/rhlibrary/snd") + p, err := player.NewPlayer("/home/equinox/helsinki/rivenhell/contrib/rhlibrary/snd", rhl, rhdl) if err != nil { rhl.Println("Error initializing Player:", err) return } - pi := p.GetInterface() - pi.Load(1, 1) - pi.Play() - mw, err := NewMainWindow(640, 360) + mw, err := NewMainWindow(p.GetInterface(), 640, 360) if err != nil { rhl.Println("Error initializing Main Window:", err) return |