* forward-port of all eyetv relates sources in my branch

    - this stuff is highly unfinished; needs much more work and testing
    - don't be surprised if you don't see anything when trying it out, this port is basically a big reminder for me to keep working on it ;-)
    - the access module is probably going to be ported from CoreFoundation-driven C to Cocoa-based Obj-C
    - everything will be 10.4-only, since EyeTV is only available this way as well
    - the plugin to put into EyeTV is compiled in UB-mode by default and incorporates Public Domain code provided by Elgato Systems GmbH

configure.ac

@@ -5030,13 +5030,16 @@ AC_ARG_ENABLE(macosx,
   [  --enable-macosx         MacOS X support (default enabled on MacOS X)],
   [if test "${enable_macosx}" = "yes"
    then
-     VLC_ADD_BUILTINS([macosx])
-     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
+     VLC_ADD_PLUGINS([access_eyetv])
+     VLC_ADD_LDFLAGS([access_eyetv], [-framework CoreFoundation])
+     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL -framework QTKit])
      VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] )
    fi],
   [AC_CHECK_HEADERS(Cocoa/Cocoa.h,
+     VLC_ADD_PLUGINS([access_eyetv])
+     VLC_ADD_LDFLAGS([access_eyetv], [-framework CoreFoundation])
      VLC_ADD_BUILTINS([macosx])
-     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
+     VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL -framework QTKit])
      VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] )
    )])
 CFLAGS=$ORIGCFLAGS

extras/MacOSX/eyetvplugin/English.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

extras/MacOSX/eyetvplugin/EyeTVPluginDefs.h

+/* This is public domain code developed by Elgato Systems GmbH. No GPL-covered 
+ * changes were added to this file by any members of the VideoLAN team. If you
+ * want to do so, add a modified GPL header here, but keep a message emphasising
+ * the non-licensed parts of this header file. 
+ * Ideally, VideoLAN-related changes should only go to eyetvplugin.h.
+ * 
+ * $Id$
+ */
+
+
+#pragma once
+
+/*
+
+	The EyeTV Plugin API
+	====================
+	
+	The EyeTV Software gives third parties access to the incoming MPEG-2 transport stream. 
+	At this time the API is available for the following products:
+		
+		- EyeTV 200 (analog)
+		- EyeTV 300 (DVB-S) 
+		- EyeTV 400 (DVB-T)
+		
+	A plugin receives device plugged/unplugged notifications, it can request or release 
+	individual PIDs and most importantly it has access to transport stream packets in 
+	real time, as they arrive from the device.  Note that the plugin is called before EyeTV 
+	itself looks at the packets, so it is even possible to modify the data.
+	
+	Plugins currently live in EyeTV.app/Contens/Plugins/
+	
+	A plugin is packaged as a bundle with a single entry point:
+	
+		long EyeTVPluginDispatcher(EyeTVPluginSelector 			selector,  
+										void 					*refCon, 
+										EyeTVPluginDeviceID		deviceID, 
+						   				long 					param1, 
+						   				long 					param2,  
+						   				long 					param3, 
+						   				long 					param4);
+
+	
+	PID Filtering
+	=============
+	
+	EyeTV employs both hardware and software PID filtering.  A plugin's dispatch routine 
+	is called with the kEyeTVPluginSelector_PacketsArrived selector after the hardware 
+	PID filter (naturally) but prior to the software PID filter, so the plugin has access 
+	to all packets that are delivered by the hardware.  
+	
+	A plugin can request PIDs that are not needed by EyeTV from the hardware PID filter by 
+	means of a callback routine, see eyeTVPluginSelector_SetCallback.
+
+	Note that hardware PID filtering is on for single processor machines (to reduce the CPU 
+	load), but off for multi-processor machines (to improve channel switch times).  
+	This behaviour is controlled by the "hardware PID filter" key in com.elgato.eyetv.plist, 
+	which defaults to "Auto" ("Off" on MP machines, "On" on single-processor machines).  EyeTV
+	does not offer GUI to change this setting.  A plugin hence needs to be prepared to handle 
+	both an entire transponder or multiplex and to request PIDs it might need.
+	
+	Note that the plugin is called on the real-time thread that receives the transport stream
+	packets and that the packet buffers passed to the plugin are the actual hardware DMA buffers.
+	Please return as quickly as possible from the kEyeTVPluginSelector_PacketsArrived call and
+	avoid blocking the calling thread.
+
+
+
+
+
+	Revision History:
+
+	02/27/2004:		Initial Release.
+
+*/
+	
+
+
+#define EYETV_PLUGIN_API_VERSION				0x04021901
+#define EYETV_PLUGIN_API_MIN_VERSION			0x04021901
+
+typedef long long 	EyeTVPluginDeviceID;
+typedef long		EyeTVPluginDeviceType;
+typedef long		EyeTVPluginSelector;
+
+enum {
+	kEyeTVPIDType_Video 		= 0,
+	kEyeTVPIDType_MPEGAudio 	= 1,
+	kEyeTVPIDType_VBI 			= 2, /* teletext */
+	kEyeTVPIDType_PCR 			= 3,
+	kEyeTVPIDType_PMT 			= 4,
+	kEyeTVPIDType_Unknown 		= 5,
+	kEyeTVPIDType_AC3Audio 		= 6
+};
+
+
+typedef struct EyeTVPluginPIDInfo EyeTVPluginPIDInfo;
+struct EyeTVPluginPIDInfo {
+	long					pid;
+	long					pidType;	
+};
+
+
+
+/***********************************************************************************
+*
+*	EyeTVPluginCallbackParams,
+*
+***********************************************************************************/
+enum {
+	kEyeTVPluginCallbackSelector_RetainPIDs = 0,	
+	kEyeTVPluginCallbackSelector_ReleasePIDs = 1		
+};
+
+typedef struct EyeTVPluginCallbackParams EyeTVPluginCallbackParams;  
+struct EyeTVPluginCallbackParams {
+	EyeTVPluginDeviceID		deviceID;	//	the deviceID
+	long					selector;	// 	callback selector, see above
+	long					*pids;		// 	list of pids to release/retain
+	long					pidsCount;	//	count of pids
+};
+
+
+/***********************************************************************************
+*
+*	typedef for the callback function,
+*
+***********************************************************************************/
+typedef long(* EyeTVPluginCallbackProc)(EyeTVPluginCallbackParams *params);
+
+
+
+/***********************************************************************************
+*
+*	EyeTVPluginParamStructs
+*
+***********************************************************************************/
+
+
+typedef struct EyeTVPluginInitializeParams	EyeTVPluginInitializeParams;
+struct EyeTVPluginInitializeParams {
+	long							apiVersion;		// version of the EyeTV_PLUGIN_API
+	EyeTVPluginCallbackProc			callback;		// the callback
+}; /* 8 bytes */
+
+
+
+typedef struct EyeTVPluginGetInfoParams	EyeTVPluginGetInfoParams;
+struct EyeTVPluginGetInfoParams {
+	long							*pluginAPIVersion;		// <- EYETV_PLUGIN_API_VERSION
+	char							*pluginName;		// <- points to a 128-byte buffer, the plugin is expected to fill the buffer with
+														// 	  a UTF-8 encoded string.	
+	char							*description;		// <- points to a 1024-byte buffer, the plugin is expected to fill the buffer with
+														//	  a UTF-8 encoded string describing the plugin.
+}; /* 12 bytes */
+
+
+
+enum {
+	kEyeTVPluginDeviceType_Unknown = 0,	
+	kEyeTVPluginDeviceType_e200 = 1,
+	kEyeTVPluginDeviceType_e300 = 2,
+	kEyeTVPluginDeviceType_e400 = 3
+} ;
+
+typedef struct EyeTVPluginDeviceAddedParams EyeTVPluginDeviceAddedParams;
+struct EyeTVPluginDeviceAddedParams {
+	EyeTVPluginDeviceType			deviceType;		
+}; /* 4 bytes */
+
+
+typedef struct EyeTVPluginPacketsArrivedParams EyeTVPluginPacketsArrivedParams;
+struct EyeTVPluginPacketsArrivedParams {
+	long							**packets;		// points to an array of packets
+	long							packetCount;	
+}; /* 8 bytes */
+
+
+
+typedef struct EyeTVPluginServiceChangedParams EyeTVPluginServiceChangedParams;
+struct EyeTVPluginServiceChangedParams {
+	long							headendID;		// new headend ID. For E300 it's the orbital position of the satellite
+													// in tenth of a degree
+	long							transponderID;	// new transponder ID (The Frequency in kHz)
+	long							serviceID;		// new service ID (the ID of the used service as included in the DVB Stream)
+	EyeTVPluginPIDInfo				*pidList;		// points to the list of active PIDs;
+	long							pidCount;		// the length of pidList
+}; /* 20 bytes */
+
+
+
+
+/***********************************************************************************
+*
+*	EyeTVPluginParams
+*		
+***********************************************************************************/
+typedef struct EyeTVPluginParams EyeTVPluginParams;
+struct EyeTVPluginParams {
+	EyeTVPluginDeviceID		deviceID;	// ID of the device
+	EyeTVPluginSelector		selector;	// selector
+	void					*refCon;	// refCon
+
+	union {												
+		EyeTVPluginInitializeParams			initialize;			// kEyeTVPluginSelector_Initialize
+																// kEyeTVPluginSelector_Terminate, no additional parameters
+		EyeTVPluginGetInfoParams			info;				// kEyeTVPluginSelector_GetInfo
+		EyeTVPluginDeviceAddedParams		deviceAdded;		// kEyeTVPluginSelector_DeviceAdded
+																// kEyeTVPluginSelector_DeviceRemoved, no additional parameters
+		EyeTVPluginPacketsArrivedParams 	packetsArrived;		// kEyeTVPluginSelector_PacketsArrived
+		EyeTVPluginServiceChangedParams		serviceChanged;		// kEyeTVPluginSelector_ServiceChanged
+	
+	};
+};
+
+
+enum {		// EyeTVPluginSelector
+	kEyeTVPluginSelector_Initialize = 0,		
+	kEyeTVPluginSelector_Terminate = 1,			
+	kEyeTVPluginSelector_GetInfo = 2,			
+	kEyeTVPluginSelector_DeviceAdded = 3,		
+	kEyeTVPluginSelector_DeviceRemoved = 4,		
+	kEyeTVPluginSelector_PacketsArrived = 5,	
+	kEyeTVPluginSelector_ServiceChanged = 6	
+};						
+
+
+
+/***********************************************************************************
+*
+*	EyeTVPluginEntryProc
+*
+***********************************************************************************/
+typedef long(* EyeTVPluginEntryProc)(EyeTVPluginParams *params);

extras/MacOSX/eyetvplugin/Info.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>org.videolan.vlceyetvplugin</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>CFPlugInDynamicRegisterFunction</key>
+	<string></string>
+	<key>CFPlugInDynamicRegistration</key>
+	<string>NO</string>
+	<key>CFPlugInFactories</key>
+	<dict>
+		<key>00000000-0000-0000-0000-000000000000</key>
+		<string>MyFactoryFunction</string>
+	</dict>
+	<key>CFPlugInTypes</key>
+	<dict>
+		<key>00000000-0000-0000-0000-000000000000</key>
+		<array>
+			<string>00000000-0000-0000-0000-000000000000</string>
+		</array>
+	</dict>
+	<key>CFPlugInUnloadFunction</key>
+	<string></string>
+</dict>
+</plist>

extras/MacOSX/eyetvplugin/eyetvplugin.h

+/*****************************************************************************
+* eyetvplugin.h: Plug-In for the EyeTV software to connect to VLC
+*****************************************************************************
+* Copyright (C) 2006-2007 the VideoLAN team
+* $Id$
+*
+* Authors: Felix Kühne <fkuehne at videolan dot org>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+*****************************************************************************/
+
+#include "EyeTVPluginDefs.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <CoreFoundation/CoreFoundation.h>
+
+void VLCEyeTVPluginGlobalNotificationReceived( CFNotificationCenterRef center, 
+                                              void *observer, 
+                                              CFStringRef name, 
+                                              const void *object, 
+                                              CFDictionaryRef userInfo );
\ No newline at end of file

extras/MacOSX/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj

+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 42;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
+		8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
+		CC09359B0AE11E6A00647FD0 /* eyetvplugin.c in Sources */ = {isa = PBXBuildFile; fileRef = CC09359A0AE11E6A00647FD0 /* eyetvplugin.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
+		8D576316048677EA00EA77CD /* VLC EyeTV Plug-In.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "VLC EyeTV Plug-In.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
+		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+		CC09359A0AE11E6A00647FD0 /* eyetvplugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = eyetvplugin.c; sourceTree = "<group>"; };
+		CC09359C0AE11E7900647FD0 /* EyeTVPluginDefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EyeTVPluginDefs.h; sourceTree = "<group>"; };
+		CC3AE2920AE2E4EE00ACC87C /* eyetvplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eyetvplugin.h; sourceTree = "<group>"; };
+		CC74BC500AE2714300AD738B /* eyetv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = eyetv.c; path = ../../../modules/access/eyetv.c; sourceTree = SOURCE_ROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8D576313048677EA00EA77CD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		089C166AFE841209C02AAC07 /* VLC EyeTV Plug-In */ = {
+			isa = PBXGroup;
+			children = (
+				CC74BC530AE2715100AD738B /* access module */,
+				08FB77AFFE84173DC02AAC07 /* Source */,
+				089C167CFE841241C02AAC07 /* Resources */,
+				089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
+				19C28FB6FE9D52B211CA2CBB /* Products */,
+			);
+			name = "VLC EyeTV Plug-In";
+			sourceTree = "<group>";
+		};
+		089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */,
+			);
+			name = "External Frameworks and Libraries";
+			sourceTree = "<group>";
+		};
+		089C167CFE841241C02AAC07 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				8D576317048677EA00EA77CD /* Info.plist */,
+				8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		08FB77AFFE84173DC02AAC07 /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				CC3AE2920AE2E4EE00ACC87C /* eyetvplugin.h */,
+				CC09359A0AE11E6A00647FD0 /* eyetvplugin.c */,
+				CC09359C0AE11E7900647FD0 /* EyeTVPluginDefs.h */,
+			);
+			name = Source;
+			sourceTree = "<group>";
+		};
+		19C28FB6FE9D52B211CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D576316048677EA00EA77CD /* VLC EyeTV Plug-In.bundle */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		CC74BC530AE2715100AD738B /* access module */ = {
+			isa = PBXGroup;
+			children = (
+				CC74BC500AE2714300AD738B /* eyetv.c */,
+			);
+			name = "access module";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		8D57630D048677EA00EA77CD /* VLC EyeTV Plug-In */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "VLC EyeTV Plug-In" */;
+			buildPhases = (
+				8D57630F048677EA00EA77CD /* Resources */,
+				8D576311048677EA00EA77CD /* Sources */,
+				8D576313048677EA00EA77CD /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "VLC EyeTV Plug-In";
+			productInstallPath = "$(HOME)/Library/Bundles";
+			productName = "VLC EyeTV Plug-In";
+			productReference = 8D576316048677EA00EA77CD /* VLC EyeTV Plug-In.bundle */;
+			productType = "com.apple.product-type.bundle";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		089C1669FE841209C02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "eyetvplugin" */;
+			compatibilityVersion = "Xcode 2.4";
+			hasScannedForEncodings = 1;
+			mainGroup = 089C166AFE841209C02AAC07 /* VLC EyeTV Plug-In */;
+			projectDirPath = "";
+			projectRoot = "";
+			shouldCheckCompatibility = 1;
+			targets = (
+				8D57630D048677EA00EA77CD /* VLC EyeTV Plug-In */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D57630F048677EA00EA77CD /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8D576311048677EA00EA77CD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CC09359B0AE11E6A00647FD0 /* eyetvplugin.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				089C167EFE841241C02AAC07 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		1DEB911B08733D790010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(HOME)/Library/Bundles";
+				PRODUCT_NAME = "VLC EyeTV Plug-In";
+				WRAPPER_EXTENSION = bundle;
+				ZERO_LINK = YES;
+			};
+			name = Debug;
+		};
+		1DEB911C08733D790010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_MODEL_TUNING = G5;
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(HOME)/Library/Bundles";
+				PRODUCT_NAME = "VLC EyeTV Plug-In";
+				WRAPPER_EXTENSION = bundle;
+			};
+			name = Release;
+		};
+		1DEB911F08733D790010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PREBINDING = NO;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Debug;
+		};
+		1DEB912008733D790010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PREBINDING = NO;
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "VLC EyeTV Plug-In" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB911B08733D790010E9CD /* Debug */,
+				1DEB911C08733D790010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "eyetvplugin" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB911F08733D790010E9CD /* Debug */,
+				1DEB912008733D790010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 089C1669FE841209C02AAC07 /* Project object */;
+}

modules/access/Modules.am

@@ -7,6 +7,7 @@ SOURCES_access_http = http.c
 SOURCES_access_ftp = ftp.c
 SOURCES_access_smb = smb.c
 SOURCES_access_gnomevfs = gnomevfs.c
+SOURCES_access_eyetv = eyetv.c
 SOURCES_dvdnav = dvdnav.c
 SOURCES_dvdread = dvdread.c
 SOURCES_dc1394 = dc1394.c

modules/gui/macosx/Modules.am

@@ -46,5 +46,7 @@ SOURCES_macosx = \
 	fspanel.h \
 	update.h \
 	update.m \
+	eyetv.h \
+	eyetv.m \
 	$(NULL)
 

modules/gui/macosx/eyetv.h

+/*****************************************************************************
+* eyetv.h: small class to control the notification parts of the EyeTV plugin
+*****************************************************************************
+* Copyright (C) 2006-2007 the VideoLAN team
+* $Id$
+*
+* Authors: Felix Kühne <fkuehne at videolan dot org>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+*****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface VLCEyeTVController : NSObject 
+{
+    BOOL b_eyeTVactive;
+    BOOL b_deviceConnected;
+}
+- (void)globalNotificationReceived: (NSNotification *)theNotification;
+- (BOOL)isEyeTVrunning;
+- (BOOL)isDeviceConnected;
+- (void)launchEyeTV;
+- (void)switchChannelUp:(BOOL)b_yesOrNo;
+- (void)selectChannel:(int)theChannelNum;
+- (int)getNumberOfChannels;
+- (NSString *)getNameOfChannel:(int)theChannelNum;
+
+@end

modules/gui/macosx/eyetv.m

+/*****************************************************************************
+* eyetv.m: small class to control the notification parts of the EyeTV plugin
+*****************************************************************************
+* Copyright (C) 2006-2007 the VideoLAN team
+* $Id$
+*
+* Authors: Felix Kühne <fkuehne at videolan dot org>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+*****************************************************************************/
+
+#import "eyetv.h"
+/* for apple event interaction [carbon] */
+#import <ApplicationServices/ApplicationServices.h> 
+/* for various VLC core related calls */
+#import "intf.h"
+
+@implementation VLCEyeTVController
+
+static VLCEyeTVController *_o_sharedInstance = nil;
+
++ (VLCEyeTVController *)sharedInstance
+{
+    return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
+}
+
+- (id)init 
+{
+    if (_o_sharedInstance) {
+        [self dealloc];
+    } else {
+        _o_sharedInstance = [super init];
+
+        [[NSDistributedNotificationCenter defaultCenter] 
+                    addObserver: self
+                       selector: @selector(globalNotificationReceived:)
+                           name: NULL
+                         object: @"VLCEyeTVSupport"
+             suspensionBehavior: NSNotificationSuspensionBehaviorDeliverImmediately];
+    }
+    
+    return _o_sharedInstance;
+}
+
+- (void)globalNotificationReceived: (NSNotification *)theNotification
+{
+    msg_Dbg( VLCIntf, "notification received in VLC with name %s and object %s",
+             [[theNotification name] UTF8String], [[theNotification object] UTF8String] );
+
+    /* update our info on the used device */
+    if( [[theNotification name] isEqualToString: @"DeviceAdded"] )
+        b_deviceConnected = YES;
+    if( [[theNotification name] isEqualToString: @"DeviceRemoved"] )
+        b_deviceConnected = NO;
+
+    /* is eyetv running? */
+    if( [[theNotification name] isEqualToString: @"PluginInit"] )
+        b_eyeTVactive = YES;
+    if( [[theNotification name] isEqualToString: @"PluginQuit"] )
+        b_eyeTVactive = NO;
+}
+
+- (BOOL)isEyeTVrunning
+{
+    return b_eyeTVactive;
+}
+
+- (BOOL)isDeviceConnected
+{
+    return b_deviceConnected;
+}
+
+
+- (void)launchEyeTV
+{
+    OSStatus stat;
+    FSRef eyetvPath;
+
+    stat = LSFindApplicationForInfo ( 'EyTV',
+                                       CFSTR("com.elgato.eyetv"),
+                                       NULL,
+                                       &eyetvPath,
+                                       NULL );
+    if( stat != noErr )
+        msg_Err( VLCIntf, "finding EyeTV failed with error code %i", (int)stat );
+    
+    stat = LSOpenFSRef( &eyetvPath, NULL );
+    if( stat != noErr )
+        msg_Err( VLCIntf, "opening EyeTV failed with error code %i", (int)stat );
+    
+}
+
+- (void)switchChannelUp:(BOOL)b_yesOrNo
+{
+    OSErr err;
+    AppleEvent ourAE = {typeNull, nil};
+    AEBuildError theBuildError;
+    const OSType eyetvSignature = 'EyTV';   /* carbon FOURCC style */
+    OSType eyetvCommand;
+    
+    if( b_yesOrNo == YES )
+    {
+        eyetvCommand = 'Chup';     /* same style */
+        msg_Dbg( VLCIntf, "telling eyetv to switch 1 channel up" );
+    }
+    else
+    {
+        eyetvCommand = 'Chdn';     /* same style again */
+        msg_Dbg( VLCIntf, "telling eyetv to switch 1 channel down" );
+    }
+    
+    err = AEBuildAppleEvent(
+                            /* EyeTV script suite */ eyetvSignature,
+                            /* command */ eyetvCommand,
+                            /* signature type */ typeApplSignature,
+                            /* signature */ &eyetvSignature,
+                            /* signature size */ sizeof(eyetvSignature),
+                            /* basic return id */ kAutoGenerateReturnID,
+                            /* generic transaction id */ kAnyTransactionID,
+                            /* to-be-created AE */ &ourAE,
+                            /* get some possible errors */ &theBuildError, 
+                            /* got no params for now */ "" );
+    if( err != aeBuildSyntaxNoErr )
+    {
+        msg_Err( VLCIntf, "Error %i encountered while trying to the build the AE to launch eyetv.\n" \
+                 "additionally, the following info was returned: AEBuildErrorCode:%i at pos:%i", 
+                 (int)err, theBuildError.fError, theBuildError.fErrorPos);
+        return;
+    }
+    else
+        msg_Dbg( VLCIntf, "AE created successfully, trying to send now" );
+    
+    err = AESendMessage(
+                        /* our AE */ &ourAE,
+                        /* no need for a response-AE */ NULL,
+                        /* we neither want a response nor user interaction */ kAENoReply | kAENeverInteract,
+                        /* we don't need a special time-out */ kAEDefaultTimeout );
+    if( err != noErr )
+        msg_Err( VLCIntf, "Error %i encountered while trying to tell EyeTV to switch channel", (int)err );
+    
+    err = AEDisposeDesc(&ourAE);
+}
+
+- (void)selectChannel: (int)theChannelNum
+{
+}
+
+- (int)getNumberOfChannels
+{
+    return 2;
+}
+
+- (NSString *)getNameOfChannel: (int)theChannelNum
+{
+    return @"dummy name";
+}
+
+@end

modules/gui/macosx/intf.h

@@ -105,6 +105,7 @@ struct intf_sys_t
     id o_interaction_list;      /* VLCInteractionList*/
     id o_sfilters;              /* VLCsFilters    */
     id o_update;                /* VLCUpdate      */
+    id o_eyetv;                 /* VLCEyeTVController */
     BOOL nib_main_loaded;       /* reference to the main-nib */
     BOOL nib_open_loaded;       /* reference to the open-nib */
     BOOL nib_about_loaded;      /* reference to the about-nib */
@@ -307,6 +308,7 @@ struct intf_sys_t
 - (id)getMainIntfPgbar;
 - (id)getControllerWindow;
 - (id)getVoutMenu;
+- (id)getEyeTVController;
 - (void)applicationWillTerminate:(NSNotification *)notification;
 - (NSString *)localizedString:(char *)psz;
 - (char *)delocalizeString:(NSString *)psz;

modules/gui/macosx/intf.m

@@ -48,6 +48,7 @@
 #import "embeddedwindow.h"
 #import "update.h"
 #import "AppleRemote.h"
+#import "eyetv.h"
 
 #import <vlc_input.h>
 
@@ -359,6 +360,14 @@ static VLCMain *_o_sharedMainInstance = nil;
 	[o_remote setClickCountEnabledButtons: kRemoteButtonPlay];
     [o_remote setDelegate: _o_sharedMainInstance];
 
+    o_eyetv = [[VLCEyeTVController alloc] init];
+
+    /* announce our launch to a potential eyetv plugin */
+    [[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"VLCOSXGUIInit"
+                                                                   object: @"VLCEyeTVSupport"
+                                                                 userInfo: NULL
+                                                       deliverImmediately: YES];
+
     return _o_sharedMainInstance;
 }
 
@@ -1017,6 +1026,13 @@ static VLCMain *_o_sharedMainInstance = nil;
     return o_vout_menu;
 }
 
+- (id)getEyeTVController
+{
+    if( o_eyetv )
+        return o_eyetv;
+    return nil;
+}
+
 - (void)manage
 {
     playlist_t * p_playlist;
@@ -1621,6 +1637,9 @@ static VLCMain *_o_sharedMainInstance = nil;
     if( o_interaction_list != nil )
         [o_interaction_list release];
 
+    if( o_eyetv != nil )
+        [o_eyetv release];
+
     if( o_img_pause_pressed != nil )
     {
         [o_img_pause_pressed release];

modules/gui/macosx/open.h

@@ -42,10 +42,15 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_btn_ok;
     IBOutlet id o_btn_cancel;
 
+    IBOutlet id o_output_ckbox;
+    IBOutlet id o_sout_options;
+
+    /* open file */
     IBOutlet id o_file_path;
     IBOutlet id o_file_btn_browse;
     IBOutlet id o_file_stream;
 
+    /* open disc */
     IBOutlet id o_disc_type;
     IBOutlet id o_disc_device;
     IBOutlet id o_disc_device_lbl;
@@ -59,6 +64,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_disc_videots_btn_browse;
     IBOutlet id o_disc_dvd_menus;
 
+    /* open network */
     IBOutlet id o_net_mode;
     IBOutlet id o_net_udp_port;
     IBOutlet id o_net_udp_port_lbl;
@@ -72,6 +78,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_net_http_url_lbl;
     IBOutlet id o_net_timeshift_ckbox;
 
+    /* open subtitle file */
     IBOutlet id o_file_sub_ckbox;
     IBOutlet id o_file_sub_btn_settings;
     IBOutlet id o_file_sub_sheet;
@@ -94,8 +101,19 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_file_sub_font_box;
     IBOutlet id o_file_sub_file_box;
 
-    IBOutlet id o_output_ckbox;
-    IBOutlet id o_sout_options;
+    /* open eyetv support */
+    IBOutlet id o_eyetv_tabView;
+    IBOutlet id o_eyetv_channels_pop;
+    IBOutlet id o_eyetv_currentChannel_lbl;
+    IBOutlet id o_eyetv_chn_status_txt;
+    IBOutlet id o_eyetv_chn_bgbar;
+    IBOutlet id o_eyetv_launchEyeTV_btn;
+    IBOutlet id o_eyetv_nextProgram_btn;
+    IBOutlet id o_eyetv_noDevice_lbl;
+    IBOutlet id o_eyetv_noDeviceLong_lbl;
+    IBOutlet id o_eyetv_noEyeTV_lbl;
+    IBOutlet id o_eyetv_noEyeTVLong_lbl;
+    IBOutlet id o_eyetv_previousProgram_btn;
     
     BOOL b_autoplay;
 }
@@ -125,6 +143,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 - (IBAction)openNetStepperChanged:(id)sender;
 - (void)openNetInfoChanged:(NSNotification *)o_notification;
 
+- (IBAction)eyetvSwitchChannel:(id)sender;
+- (IBAction)eyetvLaunch:(id)sender;
+- (void)eyetvChanged:(NSNotification *)o_notification;
+- (void)setupChannelInfo;
+
 - (IBAction)subsChanged:(id)sender;
 - (IBAction)subSettings:(id)sender;
 - (IBAction)subFileBrowse:(id)sender;

modules/gui/macosx/open.m

 /*****************************************************************************
  * open.m: MacOS X module for vlc
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
@@ -39,11 +39,11 @@
 #include <IOKit/storage/IOCDMedia.h>
 #include <IOKit/storage/IODVDMedia.h>
 
-#include "intf.h"
-#include "playlist.h"
-#include "open.h"
-#include "output.h"
-#import <vlc_interface.h>
+#import "intf.h"
+#import "playlist.h"
+#import "open.h"
+#import "output.h"
+#import "eyetv.h"
 
 /*****************************************************************************
  * GetEjectableMediaOfClass 
@@ -190,6 +190,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
     [o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
     
+    [o_eyetv_chn_bgbar setUsesThreadedAnimation: YES];
+    /* FIXME: implement EyeTV l10n here */
+    
     [self setSubPanel];
 
 
@@ -232,6 +235,21 @@ static VLCOpen *_o_sharedMainInstance = nil;
         name: NSControlTextDidChangeNotification
         object: o_net_http_url];
 
+    /* wake up with the correct GUI */
+    if( [[[VLCMain sharedInstance] getEyeTVController] isEyeTVrunning] == YES )
+        [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"];
+    if( [[[VLCMain sharedInstance] getEyeTVController] isDeviceConnected] == YES )
+    {
+        [o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"];
+        [self setupChannelInfo];
+    }
+    
+    [[NSDistributedNotificationCenter defaultCenter] addObserver: self
+                                                        selector: @selector(eyetvChanged:)
+                                                            name: NULL
+                                                          object: @"VLCEyeTVSupport"
+                                              suspensionBehavior: NSNotificationSuspensionBehaviorDeliverImmediately];
+    
     /* register clicks on text fields */
     [[NSNotificationCenter defaultCenter] addObserver: self
                                              selector: @selector(textFieldWasClicked:)
@@ -779,6 +797,83 @@ static VLCOpen *_o_sharedMainInstance = nil;
     }
 }
 
+- (IBAction)eyetvSwitchChannel:(id)sender
+{
+    if( sender == o_eyetv_nextProgram_btn )
+        [[[VLCMain sharedInstance] getEyeTVController] switchChannelUp: YES];
+    else if( sender == o_eyetv_previousProgram_btn )
+        [[[VLCMain sharedInstance] getEyeTVController] switchChannelUp: NO];
+    else if( sender == o_eyetv_channels_pop )
+        [[[VLCMain sharedInstance] getEyeTVController] selectChannel: 
+            [sender indexOfSelectedItem]];
+    else
+        msg_Err( VLCIntf, "eyetvSwitchChannel sent by unknown object" );
+}
+
+- (IBAction)eyetvLaunch:(id)sender
+{
+    [[[VLCMain sharedInstance] getEyeTVController] launchEyeTV];
+}
+
+- (void)eyetvChanged:(NSNotification *)o_notification
+{
+    if( [[o_notification name] isEqualToString: @"DeviceAdded"] )
+    {
+        msg_Dbg( VLCIntf, "eyetv device was added" );
+        [o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"];
+        [self setupChannelInfo];
+    }
+    else if( [[o_notification name] isEqualToString: @"DeviceRemoved"] )
+    {
+        /* leave the channel selection like that,
+         * switch to our "no device" tab */
+        msg_Dbg( VLCIntf, "eyetv device was removed" );
+        [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"];
+    }
+    else if( [[o_notification name] isEqualToString: @"PluginQuit"] )
+    {
+        /* switch to the "launch eyetv" tab */
+        msg_Dbg( VLCIntf, "eyetv was terminated" );
+        [o_eyetv_tabView selectTabViewItemWithIdentifier:@"noeyetv"];
+    }
+    else if( [[o_notification name] isEqualToString: @"PluginInit"] )
+    {
+        /* we got no device yet */
+        msg_Dbg( VLCIntf, "eyetv was launched, no device yet" );
+        [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"];
+    }
+    else
+        msg_Warn( VLCIntf, "unknown external notify '%s' received", [[o_notification name] UTF8String] );
+}
+
+/* little helper method, since this code needs to be run by multiple objects */
+- (void)setupChannelInfo
+{
+    /* set up channel selection */
+    [o_eyetv_channels_pop removeAllItems];
+    [o_eyetv_chn_bgbar setHidden: NO];
+    [o_eyetv_chn_bgbar animate: self];
+    [o_eyetv_chn_status_txt setStringValue: _NS("Retrieving Channel Info...")];
+    [o_eyetv_chn_status_txt setHidden: NO];
+    
+    /* retrieve info */
+    int x = 0;
+    int channelCount = ( [[[VLCMain sharedInstance] getEyeTVController] getNumberOfChannels] + 1 );
+    while( x != channelCount )
+    {
+        /* we have to add items this way, because we accept duplicates 
+         * additionally, we save a bit of time */
+        [[o_eyetv_channels_pop menu] addItemWithTitle: [[[VLCMain sharedInstance] getEyeTVController] getNameOfChannel: x]
+                                               action: nil
+                                        keyEquivalent: @""];
+        x += 1;
+    }
+    
+    /* clean up GUI */
+    [o_eyetv_chn_bgbar setHidden: YES];
+    [o_eyetv_chn_status_txt setHidden: YES];
+}
+
 - (IBAction)subsChanged:(id)sender
 {
     if ([o_file_sub_ckbox state] == NSOnState)