sophie/actioncam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed verbositiy from camera constructor

Browse source
This commit is contained in:
Jonas Köritz 2019-08-28 18:03:17 +02:00
parent 3e25160671
commit 9204f1de8d
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Camera.go
View file

@ -56,14 +56,14 @@ type StoredFile struct {
} }
// CreateCamera creates a new Camera instance // 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{ camera := &Camera{
ipAddress: ipAddress, ipAddress: ipAddress,
port: port, port: port,
username: username, username: username,
password: password, password: password,
messageHandlers: make(map[uint32][]MessageHandler, 0), messageHandlers: make(map[uint32][]MessageHandler, 0),
verbose: verbose, verbose: true,
} }
return camera return camera
} }

16
ipcamera.go
View file

@ -28,7 +28,7 @@ func main() {
relay := CreateRTPRelay(net.ParseIP("127.0.0.1"), 5220) relay := CreateRTPRelay(net.ParseIP("127.0.0.1"), 5220)
defer relay.Stop() 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() defer camera.Disconnect()
log.Printf("Using Camera: %+v\n", camera) log.Printf("Using Camera: %+v\n", camera)
@ -50,9 +50,11 @@ func main() {
Short: "List files stored on the cameras SD-Card", Short: "List files stored on the cameras SD-Card",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) { 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() defer camera.Disconnect()
camera.SetVerbose(false)
camera.Connect() camera.Connect()
camera.Login() camera.Login()
files, err := camera.GetFileList() files, err := camera.GetFileList()
@ -72,7 +74,7 @@ func main() {
Short: "Take a still image and save to SD-Card", Short: "Take a still image and save to SD-Card",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) { 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() defer camera.Disconnect()
camera.Connect() camera.Connect()
@ -87,7 +89,7 @@ func main() {
Short: "Start recording video to SD-Card", Short: "Start recording video to SD-Card",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) { 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() defer camera.Disconnect()
camera.Connect() camera.Connect()
@ -102,7 +104,7 @@ func main() {
Short: "Stop recording video to SD-Card", Short: "Stop recording video to SD-Card",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) { 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() defer camera.Disconnect()
camera.Connect() camera.Connect()
@ -117,7 +119,7 @@ func main() {
Short: "Send a raw command to the camera", Short: "Send a raw command to the camera",
Args: cobra.ExactArgs(2), Args: cobra.ExactArgs(2),
Run: func(cmd *cobra.Command, args []string) { 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() defer camera.Disconnect()
camera.Connect() camera.Connect()
@ -147,7 +149,7 @@ func main() {
Short: "List files stored on the cameras SD-Card", Short: "List files stored on the cameras SD-Card",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) { 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() defer camera.Disconnect()
camera.Connect() camera.Connect()