1 files changed, 8 insertions, 8 deletions

diff --git a/src/rhlibrary/jingle_selector_widget.go b/src/rhlibrary/jingle_selector_widget.go
index aae373d..60f8cbd 100644
--- a/src/rhlibrary/jingle_selector_widget.go
+++ b/src/rhlibrary/jingle_selector_widget.go
@@ -45,7 +45,7 @@ var (
 	jinglesCutList      *gtk.Grid
 )
 
-func fetchJingles(db *rddb.DBChan) (err error) {
+func fetchJingles(db *rddb.DB) (err error) {
 	jinglesMutex.Lock()
 	defer jinglesMutex.Unlock()
 
@@ -55,7 +55,7 @@ func fetchJingles(db *rddb.DBChan) (err error) {
 	return
 }
 
-func updateJingles(db *rddb.DBChan) (err error) {
+func updateJingles(db *rddb.DB) (err error) {
 	if err = fetchJingles(db); err != nil {
 		return
 	}
@@ -90,7 +90,7 @@ func selectJingle() rddb.JingleListEntry {
 	return jingles[jinglesCurrentGroup]
 }
 
-func addJingleComboBox(grid *gtk.Grid, db *rddb.DBChan, p *player.PlayerChan) (err error) {
+func addJingleComboBox(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
@@ -192,7 +192,7 @@ func addJingleCutListHead(idx int) (err error) {
 	return
 }
 
-func getJingleCutListEntryPlayButton(cart uint, cut rddb.CutListEntry, p *player.PlayerChan, idx int) (gtk.IWidget, error) {
+func getJingleCutListEntryPlayButton(cart uint, cut rddb.CutListEntry, 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
@@ -226,7 +226,7 @@ func getJingleCutListEntryPlayButton(cart uint, cut rddb.CutListEntry, p *player
 	return frame, nil
 }
 
-func addJingleCutListEntry(idx int, cart uint, cut rddb.CutListEntry, p *player.PlayerChan) (err error) {
+func addJingleCutListEntry(idx int, cart uint, cut rddb.CutListEntry, p *player.Player) (err error) {
 	var lcut *gtk.Label
 	if lcut, err = getJingleCutListEntryLabel(fmt.Sprintf("%06d_%03d", cart, cut.Number), idx); err != nil {
 		return
@@ -277,7 +277,7 @@ func addJingleCutListSpacer(idx int) (err error) {
 	return
 }
 
-func updateJingleCutListRows(jingle rddb.JingleListEntry, db *rddb.DBChan, p *player.PlayerChan) (err error) {
+func updateJingleCutListRows(jingle rddb.JingleListEntry, db *rddb.DB, p *player.Player) (err error) {
 	if jinglesCutList != nil {
 		jinglesCutListBin.Remove(jinglesCutList)
 	}
@@ -313,7 +313,7 @@ func updateJingleCutListRows(jingle rddb.JingleListEntry, db *rddb.DBChan, p *pl
 	return
 }
 
-func addJingleCutList(grid *gtk.Grid, db *rddb.DBChan, p *player.PlayerChan) (err error) {
+func addJingleCutList(grid *gtk.Grid, db *rddb.DB, p *player.Player) (err error) {
 	var frame *gtk.Frame
 	if frame, err = gtk.FrameNew(""); err != nil {
 		return
@@ -335,7 +335,7 @@ func addJingleCutList(grid *gtk.Grid, db *rddb.DBChan, p *player.PlayerChan) (er
 	return
 }
 
-func getJinglesSelectorWidget(db *rddb.DBChan, p *player.PlayerChan) (gtk.IWidget, error) {
+func getJinglesSelectorWidget(db *rddb.DB, p *player.Player) (gtk.IWidget, error) {
 	grid, err := gtk.GridNew()
 	if err != nil {
 		return nil, err