Added Buffering and Removed some useless stuff

Author: Maximilian Brune

README.md

@@ -10,9 +10,9 @@ mumble library written in go. Intended for writing client side music bots.
 ## Features
 - you can play youtube videos (without any additional dependency)
 - it automatically uses UDP for sending audio data
+- Buffering, so no disruptions in hearing "should" occur
 
 ## TODO
-- implement buffering in the audiohandler.go (currently no "real" buffering exists which sometimes lead to short "disruptions" while hearing the music
 - implement more than just youtube videos as source for music
 
 ## Notes

gomble/audioformats/opus.go

@@ -19,25 +19,24 @@ import "unsafe"
 import "errors"
 import "strconv"
 
+// Possible constants to use
 const (
 	// Best for most VoIP/videoconference applications where listening quality and intelligibility matter most
-	OpusApplicationVoip = 2048
+	OPUS_APPICATION_VOIP = 2048
 
 	// Best for broadcast/high-fidelity application where the decoded audio sho uld be as close as possible to the input
-	OpusApplicationAudio = 2049
+	OPUS_APPLICATION_VOICE = 2049
 
 	// Only use when lowest-achievable latency is what matters most. Voice-optimized modes cannot be used.
-	OpusApplicationRestrictedLowdelay = 2051
-)
+	OPUS_APPLICATION_RESTRICTEDLOWDELAY = 2051
 
-const (
 	// Signal being encoded is voice
-	OpusSignalVoice = 3001
+	OPUS_SIGNAL_VOICE = 3001
 	// Signal being encoded is music
-	OpusSignalMusic = 3002
+	OPUS_SIGNAL_MUSIC = 3002
 )
 
-// Constants for encoding to opus
+// Settings for encoding to opus
 const (
 	// samplerate of 48kHz is opus default setting
 	OPUS_SAMPLE_RATE = 48000
@@ -59,7 +58,7 @@ const (
 	//OPUS_MAX_PACKET_SIZE = 1275
 
 	// The Application to use for opus. libopus will automatically
-	OPUS_APPLICATION = OpusApplicationAudio
+	OPUS_APPLICATION = OPUS_APPLICATION_VOICE
 
 	// Variable Bit Rate, if set to one libopus will automatically change the bitrate as it sees fit.
 	OPUS_VBR = 0

gomble/audiohandler.go

@@ -1,8 +1,5 @@
 package gomble
 
-import "github.com/CodingVoid/gomble/gomble/audiosources"
-
-// I need a base type.
 type event interface {
 }
 
@@ -17,23 +14,25 @@ type ChannelMessageReceivedEvent struct {
 	Message string
 }
 
-// Track related
+// Track got interrupted/stopped by user
+type TrackStoppedEvent struct {
+	Track  *Track
+}
 
-// Reasons why track ended playing
-type TrackEndedReason int
+// Track got paused
+type TrackPausedEvent struct {
+	Track  *Track
+}
 
-const (
-	// Track got interrupted by user
-	TRACK_INTERRUPTED = iota
-	// Track ended playing because Track was over
-	TRACK_ENDED
-	// Some other failure occurred. The Logs should be checked for further Information
-	TRACK_OTHER
-)
+// Track Finished playing
+type TrackFinishedEvent struct {
+	Track  *Track
+}
 
-type TrackEndedEvent struct {
-	Track  audiosources.Audiosource
-	Reason TrackEndedReason
+// Some other failure occurred. The Logs should be checked for further Information
+type TrackExceptionEvent struct {
+	Track  *Track
+	err	   error
 }
 
 /* Audiosource/Track related stuff

gomble/container/mediaContainer.go

@@ -18,7 +18,10 @@ var Listener listener
 type listener struct {
 	OnPrivateMessageReceived func(e PrivateMessageReceivedEvent)
 	OnChannelMessageReceived func(e ChannelMessageReceivedEvent)
-	OnTrackEnded             func(e TrackEndedEvent)
+	OnTrackPaused			 func(e TrackPausedEvent)
+	OnTrackStopped			 func(e TrackStoppedEvent)
+	OnTrackException		 func(e TrackExceptionEvent)
+	OnTrackFinished			 func(e TrackFinishedEvent)
 }
 
 // conn is our tcp connection to the server. It is used by packagereader.go to read packages from mumble-server and by packagewriter to write packages to the mumble-server.
@@ -103,19 +106,34 @@ func eventRoutine() {
 	for e := range eventpuffer {
 		switch e.(type) {
 		case PrivateMessageReceivedEvent:
-			logger.Debugf("Received Private Message Received event\n")
+			logger.Debugf("Received PrivateMessageReceivedEvent\n")
 			if Listener.OnPrivateMessageReceived != nil {
 				Listener.OnPrivateMessageReceived(e.(PrivateMessageReceivedEvent))
 			}
 		case ChannelMessageReceivedEvent:
-			logger.Debugf("Received Channel Message Received event\n")
+			logger.Debugf("Received ChannelMessageReceivedEvent\n")
 			if Listener.OnChannelMessageReceived != nil {
 				Listener.OnChannelMessageReceived(e.(ChannelMessageReceivedEvent))
 			}
-		case TrackEndedEvent:
-			logger.Debugf("Received TrackEndedEvent\n")
-			if Listener.OnTrackEnded != nil {
-				Listener.OnTrackEnded(e.(TrackEndedEvent))
+		case TrackFinishedEvent:
+			logger.Debugf("Received TrackFinishedEvent\n")
+			if Listener.OnTrackFinished != nil {
+				Listener.OnTrackFinished(e.(TrackFinishedEvent))
+			}
+		case TrackPausedEvent:
+			logger.Debugf("Received TrackPausedEvent\n")
+			if Listener.OnTrackPaused != nil {
+				Listener.OnTrackPaused(e.(TrackPausedEvent))
+			}
+		case TrackStoppedEvent:
+			logger.Debugf("Received TrackStoppedEvent\n")
+			if Listener.OnTrackStopped != nil {
+				Listener.OnTrackStopped(e.(TrackStoppedEvent))
+			}
+		case TrackExceptionEvent:
+			logger.Debugf("Received TrackExceptionEvent\n")
+			if Listener.OnTrackException != nil {
+				Listener.OnTrackException(e.(TrackExceptionEvent))
 			}
 		default:
 			logger.Errorf("Received unknown Event\n")