1 files changed, 8 insertions, 8 deletions

diff --git a/src/rhlibrary/show_selector_widget.go b/src/rhlibrary/show_selector_widget.go
index 9905b75..55c255b 100644
--- a/src/rhlibrary/show_selector_widget.go
+++ b/src/rhlibrary/show_selector_widget.go
@@ -45,7 +45,7 @@ var (
 	showsCartList    *gtk.Grid
 )
 
-func fetchShows(db *rddb.DBChan) (err error) {
+func fetchShows(db *rddb.DB) (err error) {
 	showsMutex.Lock()
 	defer showsMutex.Unlock()
 
@@ -55,7 +55,7 @@ func fetchShows(db *rddb.DBChan) (err error) {
 	return
 }
 
-func updateShows(db *rddb.DBChan) (err error) {
+func updateShows(db *rddb.DB) (err error) {
 	if err = fetchShows(db); err != nil {
 		return
 	}
@@ -95,7 +95,7 @@ func selectShow() rddb.ShowListEntry {
 	return shows[showsCurrentID]
 }
 
-func addShowComboBox(grid *gtk.Grid, db *rddb.DBChan, p *player.PlayerChan) (err error) {
+func addShowComboBox(grid *gtk.Grid, db *rddb.DB, p *player.Player) (err error) {
 	var box *gtk.Box
 	if box, err = gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 10); err != nil {
 		return
@@ -163,7 +163,7 @@ func getShowCartListHeadLabel(caption string) (label *gtk.Label, err error) {
      }`)
 }
 
-func getShowCartListEntryPlayButton(cart rddb.CartListEntry, p *player.PlayerChan, idx int) (gtk.IWidget, error) {
+func getShowCartListEntryPlayButton(cart rddb.CartListEntry, p *player.Player, idx int) (gtk.IWidget, error) {
 	btn, err := gtk.ButtonNewFromIconName("media-playback-start", gtk.ICON_SIZE_SMALL_TOOLBAR)
 	if err != nil {
 		return nil, err
@@ -206,7 +206,7 @@ func getShowCartListEntryPlayButton(cart rddb.CartListEntry, p *player.PlayerCha
 	return frame, nil
 }
 
-func addShowCartListEntry(idx int, cart rddb.CartListEntry, p *player.PlayerChan) (err error) {
+func addShowCartListEntry(idx int, cart rddb.CartListEntry, p *player.Player) (err error) {
 	var lcart *gtk.Label
 	if lcart, err = getShowCartListEntryLabel(strconv.FormatUint(uint64(cart.Number), 10), idx); err != nil {
 		return
@@ -318,7 +318,7 @@ func addShowCartListHead(idx int) (err error) {
 	return
 }
 
-func updateShowCartListRows(show rddb.ShowListEntry, db *rddb.DBChan, p *player.PlayerChan) (err error) {
+func updateShowCartListRows(show rddb.ShowListEntry, db *rddb.DB, p *player.Player) (err error) {
 	if showsCartList != nil {
 		showsCartListBin.Remove(showsCartList)
 	}
@@ -344,7 +344,7 @@ func updateShowCartListRows(show rddb.ShowListEntry, db *rddb.DBChan, p *player.
 	return
 }
 
-func addShowCartList(grid *gtk.Grid, db *rddb.DBChan, p *player.PlayerChan) (err error) {
+func addShowCartList(grid *gtk.Grid, db *rddb.DB, p *player.Player) (err error) {
 	var frame *gtk.Frame
 	if frame, err = gtk.FrameNew(""); err != nil {
 		return
@@ -366,7 +366,7 @@ func addShowCartList(grid *gtk.Grid, db *rddb.DBChan, p *player.PlayerChan) (err
 	return
 }
 
-func getShowsSelectorWidget(db *rddb.DBChan, p *player.PlayerChan) (gtk.IWidget, error) {
+func getShowsSelectorWidget(db *rddb.DB, p *player.Player) (gtk.IWidget, error) {
 	grid, err := gtk.GridNew()
 	if err != nil {
 		return nil, err