From 9204f1de8d6716f110065a69a75e5c4cc33a5cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20K=C3=B6ritz?= Date: Wed, 28 Aug 2019 18:03:17 +0200 Subject: [PATCH] Removed verbositiy from camera constructor --- Camera.go | 4 ++-- ipcamera.go | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Camera.go b/Camera.go index ce026a5..a6c8127 100644 --- a/Camera.go +++ b/Camera.go @@ -56,14 +56,14 @@ type StoredFile struct { } // CreateCamera creates a new Camera instance -func CreateCamera(ipAddress net.IP, port int, username, password string, verbose bool) *Camera { +func CreateCamera(ipAddress net.IP, port int, username, password string) *Camera { camera := &Camera{ ipAddress: ipAddress, port: port, username: username, password: password, messageHandlers: make(map[uint32][]MessageHandler, 0), - verbose: verbose, + verbose: true, } return camera } diff --git a/ipcamera.go b/ipcamera.go index 6a4dd73..e6bb1e7 100644 --- a/ipcamera.go +++ b/ipcamera.go @@ -28,7 +28,7 @@ func main() { relay := CreateRTPRelay(net.ParseIP("127.0.0.1"), 5220) defer relay.Stop() - camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password, true) + camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password) defer camera.Disconnect() log.Printf("Using Camera: %+v\n", camera) @@ -50,9 +50,11 @@ func main() { Short: "List files stored on the cameras SD-Card", Args: cobra.ExactArgs(1), Run: func(cmd *cobra.Command, args []string) { - camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password, false) + camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password) defer camera.Disconnect() + camera.SetVerbose(false) + camera.Connect() camera.Login() files, err := camera.GetFileList() @@ -72,7 +74,7 @@ func main() { Short: "Take a still image and save to SD-Card", Args: cobra.ExactArgs(1), Run: func(cmd *cobra.Command, args []string) { - camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password, true) + camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password) defer camera.Disconnect() camera.Connect() @@ -87,7 +89,7 @@ func main() { Short: "Start recording video to SD-Card", Args: cobra.ExactArgs(1), Run: func(cmd *cobra.Command, args []string) { - camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password, true) + camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password) defer camera.Disconnect() camera.Connect() @@ -102,7 +104,7 @@ func main() { Short: "Stop recording video to SD-Card", Args: cobra.ExactArgs(1), Run: func(cmd *cobra.Command, args []string) { - camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password, true) + camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password) defer camera.Disconnect() camera.Connect() @@ -117,7 +119,7 @@ func main() { Short: "Send a raw command to the camera", Args: cobra.ExactArgs(2), Run: func(cmd *cobra.Command, args []string) { - camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password, true) + camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password) defer camera.Disconnect() camera.Connect() @@ -147,7 +149,7 @@ func main() { Short: "List files stored on the cameras SD-Card", Args: cobra.ExactArgs(1), Run: func(cmd *cobra.Command, args []string) { - camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password, true) + camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password) defer camera.Disconnect() camera.Connect()