Make cec package compatible with libCEC v3.1

.gitignore

@@ -0,0 +1,2 @@
+# Vim stuff
+*.swp

README.md

@@ -16,10 +16,18 @@ A simple example to turn on the TV:
 ```go
 package main
 
-import "github.com/chbmuc/cec"
+import (
+	"flag"
+
+	"github.com/chbmuc/cec"
+)
 
 func main() {
+	flag.Parse()
 	cec.Open("", "cec.go")
-	cec.PowerOn(0)
+	cec.PowerOn(cec.TV)
 }
 ```
+
+To see log output from this package, add the '--logtostderr' flag when executing your binary.
+To see debug output from libCEC, add the '--logtostderr' and '--v=2' flags when executing your binary.

callbacks.go

@@ -4,13 +4,13 @@ package cec
 import "C"
 
 import (
-        "log"
-        "unsafe"
+	"unsafe"
+
+	"github.com/golang/glog"
 )
 
 //export logMessageCallback
 func logMessageCallback(c unsafe.Pointer, msg C.cec_log_message) C.int {
-	log.Println(C.GoString(&msg.message[0]))
-
-        return 0;
+	glog.V(2).Info(C.GoString(&msg.message[0]))
+	return 0
 }

cec.go

@@ -1,76 +1,97 @@
 package cec
 
-import(
-	"log"
+import (
 	"encoding/hex"
-	"time"
 	"strings"
+	"time"
+
+	"github.com/golang/glog"
+)
+
+// Logical address values
+const (
+	TV int = iota
+	Recording
+	Recording2
+	Tuner
+	Playback
+	Audio
+	Tuner2
+	Tuner3
+	Playback2
+	Recording3
+	Tuner4
+	Playback3
+	Reserved
+	Reserved2
+	Free
+	Broadcast
 )
 
 type Device struct {
-	OSDName string
-	Vendor string
-	LogicalAddress int
-	ActiveSource bool
-	PowerStatus string
+	OSDName         string
+	Vendor          string
+	LogicalAddress  int
+	ActiveSource    bool
+	PowerStatus     string
 	PhysicalAddress string
 }
 
-var logicalNames = []string{ "TV", "Recording", "Recording2", "Tuner",
-	"Playback","Audio", "Tuner2", "Tuner3",
+var logicalNames = []string{"TV", "Recording", "Recording2", "Tuner",
+	"Playback", "Audio", "Tuner2", "Tuner3",
 	"Playback2", "Recording3", "Tuner4", "Playback3",
-	"Reserved", "Reserved2", "Free", "Broadcast" }
-
-var vendorList = map[uint64]string{ 0x000039:"Toshiba", 0x0000F0:"Samsung",
-	0x0005CD:"Denon", 0x000678:"Marantz", 0x000982:"Loewe", 0x0009B0:"Onkyo",
-	0x000CB8:"Medion", 0x000CE7:"Toshiba", 0x001582:"Pulse Eight",
-	0x0020C7:"Akai", 0x002467:"Aoc", 0x008045:"Panasonic", 0x00903E:"Philips",
-	0x009053:"Daewoo", 0x00A0DE:"Yamaha", 0x00D0D5:"Grundig",
-	0x00E036:"Pioneer", 0x00E091:"LG", 0x08001F:"Sharp", 0x080046:"Sony",
-	0x18C086:"Broadcom", 0x6B746D:"Vizio", 0x8065E9:"Benq",
-	0x9C645E:"Harman Kardon" }
-
-var keyList = map[int]string{ 0x00:"Select", 0x01:"Up", 0x02:"Down", 0x03:"Left",
-	0x04:"Right", 0x05:"RightUp", 0x06:"RightDown", 0x07:"LeftUp",
-	0x08:"LeftDown", 0x09:"RootMenu", 0x0A:"SetupMenu", 0x0B:"ContentsMenu",
-	0x0C:"FavoriteMenu", 0x0D:"Exit", 0x20:"0", 0x21:"1", 0x22:"2", 0x23:"3",
-	0x24:"4", 0x25:"5", 0x26:"6", 0x27:"7", 0x28:"8", 0x29:"9", 0x2A:"Dot",
-	0x2B:"Enter", 0x2C:"Clear", 0x2F:"NextFavorite", 0x30:"ChannelUp",
-	0x31:"ChannelDown", 0x32:"PreviousChannel", 0x33:"SoundSelect",
-	0x34:"InputSelect", 0x35:"DisplayInformation", 0x36:"Help",
-	0x37:"PageUp", 0x38:"PageDown", 0x40:"Power", 0x41:"VolumeUp",
-	0x42:"VolumeDown", 0x43:"Mute", 0x44:"Play", 0x45:"Stop", 0x46:"Pause",
-	0x47:"Record", 0x48:"Rewind", 0x49:"FastForward", 0x4A:"Eject",
-	0x4B:"Forward", 0x4C:"Backward", 0x4D:"StopRecord", 0x4E:"PauseRecord",
-	0x50:"Angle", 0x51:"SubPicture", 0x52:"VideoOnDemand",
-	0x53:"ElectronicProgramGuide", 0x54:"TimerProgramming",
-	0x55:"InitialConfiguration", 0x60:"PlayFunction", 0x61:"PausePlay",
-	0x62:"RecordFunction", 0x63:"PauseRecordFunction",
-	0x64:"StopFunction", 0x65:"Mute",
-	0x66:"RestoreVolume", 0x67:"Tune", 0x68:"SelectMedia",
-	0x69:"SelectAvInput", 0x6A:"SelectAudioInput", 0x6B:"PowerToggle",
-	0x6C:"PowerOff", 0x6D:"PowerOn", 0x71:"Blue", 0X72:"Red", 0x73:"Green",
-	0x74:"Yellow", 0x75:"F5", 0x76:"Data", 0x91:"AnReturn",
-	0x96:"Max" }
+	"Reserved", "Reserved2", "Free", "Broadcast"}
+
+var vendorList = map[uint64]string{0x000039: "Toshiba", 0x0000F0: "Samsung",
+	0x0005CD: "Denon", 0x000678: "Marantz", 0x000982: "Loewe", 0x0009B0: "Onkyo",
+	0x000CB8: "Medion", 0x000CE7: "Toshiba", 0x001582: "Pulse Eight",
+	0x0020C7: "Akai", 0x002467: "Aoc", 0x008045: "Panasonic", 0x00903E: "Philips",
+	0x009053: "Daewoo", 0x00A0DE: "Yamaha", 0x00D0D5: "Grundig",
+	0x00E036: "Pioneer", 0x00E091: "LG", 0x08001F: "Sharp", 0x080046: "Sony",
+	0x18C086: "Broadcom", 0x6B746D: "Vizio", 0x8065E9: "Benq",
+	0x9C645E: "Harman Kardon"}
+
+var keyList = map[int]string{0x00: "Select", 0x01: "Up", 0x02: "Down", 0x03: "Left",
+	0x04: "Right", 0x05: "RightUp", 0x06: "RightDown", 0x07: "LeftUp",
+	0x08: "LeftDown", 0x09: "RootMenu", 0x0A: "SetupMenu", 0x0B: "ContentsMenu",
+	0x0C: "FavoriteMenu", 0x0D: "Exit", 0x20: "0", 0x21: "1", 0x22: "2", 0x23: "3",
+	0x24: "4", 0x25: "5", 0x26: "6", 0x27: "7", 0x28: "8", 0x29: "9", 0x2A: "Dot",
+	0x2B: "Enter", 0x2C: "Clear", 0x2F: "NextFavorite", 0x30: "ChannelUp",
+	0x31: "ChannelDown", 0x32: "PreviousChannel", 0x33: "SoundSelect",
+	0x34: "InputSelect", 0x35: "DisplayInformation", 0x36: "Help",
+	0x37: "PageUp", 0x38: "PageDown", 0x40: "Power", 0x41: "VolumeUp",
+	0x42: "VolumeDown", 0x43: "Mute", 0x44: "Play", 0x45: "Stop", 0x46: "Pause",
+	0x47: "Record", 0x48: "Rewind", 0x49: "FastForward", 0x4A: "Eject",
+	0x4B: "Forward", 0x4C: "Backward", 0x4D: "StopRecord", 0x4E: "PauseRecord",
+	0x50: "Angle", 0x51: "SubPicture", 0x52: "VideoOnDemand",
+	0x53: "ElectronicProgramGuide", 0x54: "TimerProgramming",
+	0x55: "InitialConfiguration", 0x60: "PlayFunction", 0x61: "PausePlay",
+	0x62: "RecordFunction", 0x63: "PauseRecordFunction",
+	0x64: "StopFunction", 0x65: "Mute",
+	0x66: "RestoreVolume", 0x67: "Tune", 0x68: "SelectMedia",
+	0x69: "SelectAvInput", 0x6A: "SelectAudioInput", 0x6B: "PowerToggle",
+	0x6C: "PowerOff", 0x6D: "PowerOn", 0x71: "Blue", 0X72: "Red", 0x73: "Green",
+	0x74: "Yellow", 0x75: "F5", 0x76: "Data", 0x91: "AnReturn",
+	0x96: "Max"}
 
 func Open(name string, deviceName string) {
 	var config CECConfiguration
 	config.DeviceName = deviceName
 
 	if er := cecInit(config); er != nil {
-		log.Println(er)
-		return	
+		glog.Error(er)
+		return
 	}
 
 	adapter, er := getAdapter(name)
 	if er != nil {
-		log.Println(er)
+		glog.Error(er)
 		return
 	}
 
 	er = openAdapter(adapter)
 	if er != nil {
-		log.Println(er)
+		glog.Error(er)
 		return
 	}
 }
@@ -82,8 +103,8 @@ func Key(address int, key interface{}) {
 	case string:
 		if key[:2] == "0x" && len(key) == 4 {
 			keybytes, err := hex.DecodeString(key[2:])
-	                if err != nil {
-				log.Println(err)
+			if err != nil {
+				glog.Error(err)
 				return
 			}
 			keycode = int(keybytes[0])
@@ -93,18 +114,18 @@ func Key(address int, key interface{}) {
 	case int:
 		keycode = key
 	default:
-		log.Println("Invalid key type")
+		glog.Error("Invalid key type")
 		return
 	}
 	er := KeyPress(address, keycode)
 	if er != nil {
-		log.Println(er)
+		glog.Error(er)
 		return
 	}
 	time.Sleep(10 * time.Millisecond)
 	er = KeyRelease(address)
 	if er != nil {
-		log.Println(er)
+		glog.Error(er)
 		return
 	}
 }
@@ -115,7 +136,7 @@ func List() map[string]Device {
 	active_devices := GetActiveDevices()
 
 	for address, active := range active_devices {
-		if (active) {
+		if active {
 			var dev Device
 
 			dev.LogicalAddress = address
@@ -132,15 +153,15 @@ func List() map[string]Device {
 }
 
 func removeSeparators(in string) string {
-        // remove separators (":", "-", " ", "_")
-        out := strings.Map(func(r rune) rune {
-                if strings.IndexRune(":-_ ", r) < 0 {
-                        return r
-                }
-                return -1
-        }, in)
-
-	return(out)
+	// remove separators (":", "-", " ", "_")
+	out := strings.Map(func(r rune) rune {
+		if strings.IndexRune(":-_ ", r) < 0 {
+			return r
+		}
+		return -1
+	}, in)
+
+	return (out)
 }
 
 func GetKeyCodeByName(name string) int {
@@ -166,7 +187,7 @@ func GetLogicalAddressByName(name string) int {
 
 	name = strings.ToLower(name)
 
-	for i:=0; i<16; i++ {
+	for i := 0; i < 16; i++ {
 		if strings.ToLower(logicalNames[i]) == name {
 			return i
 		}