From 58d040b65070d505eff078e5fb83955946dbbb6a Mon Sep 17 00:00:00 2001
From: Carl Kittelberger <icedream@icedream.pw>
Date: Wed, 11 Apr 2018 09:35:00 +0200
Subject: [PATCH] Revert to standard package names for plugins.

We can still implement the plugins as go-plugins by implementing a
separate main package that makes use of the non-main code.
---
 main.go                            | 4 ++--
 plugins/icecast/input/instance.go  | 2 +-
 plugins/icecast/input/plugin.go    | 4 +---
 plugins/icecast/output/instance.go | 2 +-
 plugins/icecast/output/plugin.go   | 4 +---
 plugins/test/sine/instance.go      | 2 +-
 plugins/test/sine/plugin.go        | 4 +---
 plugins/test/sine/sine_stream.go   | 2 +-
 8 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/main.go b/main.go
index 1ab7d84..81aacd8 100644
--- a/main.go
+++ b/main.go
@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"time"
 
-	"git.icedream.tech/icedream/uplink/app/sources"
 	"git.icedream.tech/icedream/uplink/app/streams"
+	"git.icedream.tech/icedream/uplink/plugins/test/sine"
 
 	humanize "github.com/dustin/go-humanize"
 	"github.com/gorilla/mux"
@@ -28,7 +28,7 @@ func main() {
 	go func() {
 		log.Println("Sine stream goroutine started")
 
-		sine := new(sources.SineStream)
+		sine := new(sine.SineStream)
 		sine.Samplerate = 44100
 		sine.Frequency = 990
 		sine.Beep = true
diff --git a/plugins/icecast/input/instance.go b/plugins/icecast/input/instance.go
index 8685a8e..25cd6de 100644
--- a/plugins/icecast/input/instance.go
+++ b/plugins/icecast/input/instance.go
@@ -1,4 +1,4 @@
-package main
+package icecast_input
 
 import (
 	"io"
diff --git a/plugins/icecast/input/plugin.go b/plugins/icecast/input/plugin.go
index 1b04ee7..5799f35 100644
--- a/plugins/icecast/input/plugin.go
+++ b/plugins/icecast/input/plugin.go
@@ -1,6 +1,4 @@
-package main
-
-import "C"
+package icecast_input
 
 import (
 	"git.icedream.tech/icedream/uplink/plugins"
diff --git a/plugins/icecast/output/instance.go b/plugins/icecast/output/instance.go
index 8685a8e..2c2c343 100644
--- a/plugins/icecast/output/instance.go
+++ b/plugins/icecast/output/instance.go
@@ -1,4 +1,4 @@
-package main
+package icecast_output
 
 import (
 	"io"
diff --git a/plugins/icecast/output/plugin.go b/plugins/icecast/output/plugin.go
index 3a81b89..faea364 100644
--- a/plugins/icecast/output/plugin.go
+++ b/plugins/icecast/output/plugin.go
@@ -1,6 +1,4 @@
-package main
-
-import "C"
+package icecast_output
 
 import (
 	"git.icedream.tech/icedream/uplink/plugins"
diff --git a/plugins/test/sine/instance.go b/plugins/test/sine/instance.go
index faeffa9..d21d8c3 100644
--- a/plugins/test/sine/instance.go
+++ b/plugins/test/sine/instance.go
@@ -1,4 +1,4 @@
-package main
+package sine
 
 import (
 	"io"
diff --git a/plugins/test/sine/plugin.go b/plugins/test/sine/plugin.go
index 1b04ee7..34444f3 100644
--- a/plugins/test/sine/plugin.go
+++ b/plugins/test/sine/plugin.go
@@ -1,6 +1,4 @@
-package main
-
-import "C"
+package sine
 
 import (
 	"git.icedream.tech/icedream/uplink/plugins"
diff --git a/plugins/test/sine/sine_stream.go b/plugins/test/sine/sine_stream.go
index 3ddb180..1697a37 100644
--- a/plugins/test/sine/sine_stream.go
+++ b/plugins/test/sine/sine_stream.go
@@ -1,4 +1,4 @@
-package main
+package sine
 
 import (
 	"bytes"