From ea3e0b5a08740238d48b1c5eb73adf5e3412f4ef Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Wed, 13 Jan 2016 22:05:40 +0100
Subject: renamed MainWindow to AppWindow


diff --git a/src/rhlibrary/app_window.go b/src/rhlibrary/app_window.go
new file mode 100644
index 0000000..c524f36
--- /dev/null
+++ b/src/rhlibrary/app_window.go
@@ -0,0 +1,71 @@
+//
+//  rhlibrary
+//
+//  The Radio Helsinki Rivendell Library
+//
+//
+//  Copyright (C) 2016 Christian Pointner <equinox@helsinki.at>
+//
+//  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 <http://www.gnu.org/licenses/>.
+//
+
+package main
+
+import (
+	"code.helsinki.at/rhrd-go/player"
+	"github.com/gotk3/gotk3/gtk"
+)
+
+func init() {
+	gtk.Init(nil)
+}
+
+type AppWindow struct {
+	win    *gtk.Window
+	player *player.PlayerChan
+}
+
+func (mw *AppWindow) ShowAndRun() {
+	mw.win.ShowAll()
+	if err := mw.player.Load(1, 1); err != nil {
+		rhl.Println(err)
+	}
+	if err := mw.player.Play(); err != nil {
+		rhl.Println(err)
+	}
+	gtk.Main()
+}
+
+func NewAppWindow(player *player.PlayerChan, width, height int) (mw *AppWindow, err error) {
+	mw = &AppWindow{}
+	mw.player = player
+	if mw.win, err = gtk.WindowNew(gtk.WINDOW_TOPLEVEL); err != nil {
+		return
+	}
+	mw.win.SetTitle("rhlibrary")
+	mw.win.Connect("destroy", func() {
+		gtk.MainQuit()
+	})
+
+	var l *gtk.Label
+	if l, err = gtk.LabelNew("Hello, world!"); err != nil {
+		return
+	}
+	mw.win.Add(l)
+
+	mw.win.SetDefaultSize(width, height)
+	return
+}
diff --git a/src/rhlibrary/main.go b/src/rhlibrary/main.go
index 1676c18..3b87e19 100644
--- a/src/rhlibrary/main.go
+++ b/src/rhlibrary/main.go
@@ -90,7 +90,7 @@ func main() {
 		return
 	}
 
-	mw, err := NewMainWindow(p.GetInterface(), 640, 360)
+	mw, err := NewAppWindow(p.GetInterface(), 640, 360)
 	if err != nil {
 		rhl.Println("Error initializing Main Window:", err)
 		return
diff --git a/src/rhlibrary/mainwindow.go b/src/rhlibrary/mainwindow.go
deleted file mode 100644
index d7c240d..0000000
--- a/src/rhlibrary/mainwindow.go
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-//  rhlibrary
-//
-//  The Radio Helsinki Rivendell Library
-//
-//
-//  Copyright (C) 2016 Christian Pointner <equinox@helsinki.at>
-//
-//  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 <http://www.gnu.org/licenses/>.
-//
-
-package main
-
-import (
-	"code.helsinki.at/rhrd-go/player"
-	"github.com/gotk3/gotk3/gtk"
-)
-
-func init() {
-	gtk.Init(nil)
-}
-
-type MainWindow struct {
-	win    *gtk.Window
-	player *player.PlayerChan
-}
-
-func (mw *MainWindow) ShowAndRun() {
-	mw.win.ShowAll()
-	if err := mw.player.Load(1, 1); err != nil {
-		rhl.Println(err)
-	}
-	if err := mw.player.Play(); err != nil {
-		rhl.Println(err)
-	}
-	gtk.Main()
-}
-
-func NewMainWindow(player *player.PlayerChan, width, height int) (mw *MainWindow, err error) {
-	mw = &MainWindow{}
-	mw.player = player
-	if mw.win, err = gtk.WindowNew(gtk.WINDOW_TOPLEVEL); err != nil {
-		return
-	}
-	mw.win.SetTitle("rhlibrary")
-	mw.win.Connect("destroy", func() {
-		gtk.MainQuit()
-	})
-
-	var l *gtk.Label
-	if l, err = gtk.LabelNew("Hello, world!"); err != nil {
-		return
-	}
-	mw.win.Add(l)
-
-	mw.win.SetDefaultSize(width, height)
-	return
-}
-- 
cgit v0.10.2