[vlc-commits] eyetv plugin: change logic to support HD streams as suggested by cbscpe on the forums and prepare for a potential release

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Apr  4 15:46:56 2011 +0200| [fc617621647fdfe9549510b6ea0d7ae30a318f4b] | committer: Felix Paul Kühne

eyetv plugin: change logic to support HD streams as suggested by cbscpe on the forums and prepare for a potential release

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fc617621647fdfe9549510b6ea0d7ae30a318f4b
---

 .../eyetvplugin/English.lproj/InfoPlist.strings    |  Bin 202 -> 212 bytes
 extras/package/macosx/eyetvplugin/Info.plist       |    8 ++++----
 extras/package/macosx/eyetvplugin/eyetvplugin.c    |   11 ++++-------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings b/extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings
index decf297..d19e374 100644
Binary files a/extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings and b/extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings differ
diff --git a/extras/package/macosx/eyetvplugin/Info.plist b/extras/package/macosx/eyetvplugin/Info.plist
index b502a44..1175223 100644
--- a/extras/package/macosx/eyetvplugin/Info.plist
+++ b/extras/package/macosx/eyetvplugin/Info.plist
@@ -1,25 +1,25 @@
 <?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">
+<!DOCTYPE plist PUBLIC "-//Apple//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>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFPlugInDynamicRegisterFunction</key>
 	<string></string>
 	<key>CFPlugInDynamicRegistration</key>
diff --git a/extras/package/macosx/eyetvplugin/eyetvplugin.c b/extras/package/macosx/eyetvplugin/eyetvplugin.c
index 3f190a6..c350ef3 100644
--- a/extras/package/macosx/eyetvplugin/eyetvplugin.c
+++ b/extras/package/macosx/eyetvplugin/eyetvplugin.c
@@ -309,13 +309,9 @@ static long VLCEyeTVPluginPacketsArrived(VLCEyeTVPluginGlobals_t *globals, EyeTV
                             {
                                 if( globals->activePIDs[i].pid == pid )
                                 {
-                                    if( packetBufferSize <= (sizeof(packetBuffer)-sizeof(TransportStreamPacket)) )
-                                    {
-                                        /* copy packet in our buffer */
-                                        memcpy(packetBuffer+packetBufferSize, *packets, sizeof(TransportStreamPacket));
-                                        packetBufferSize += sizeof(TransportStreamPacket);
-                                    }
-                                    else
+                                    memcpy(packetBuffer+packetBufferSize, *packets, sizeof(TransportStreamPacket));
+                                    packetBufferSize += sizeof(TransportStreamPacket);
+                                    if( packetBufferSize > (sizeof(packetBuffer)-sizeof(TransportStreamPacket)) )
                                     {
                                         /* flush buffer to VLC */
                                         ssize_t sent = write(i_vlcSock, packetBuffer, packetBufferSize);
@@ -331,6 +327,7 @@ static long VLCEyeTVPluginPacketsArrived(VLCEyeTVPluginGlobals_t *globals, EyeTV
                                         }
                                         packetBufferSize = 0;
                                     }
+
                                     if( i > 0 )
                                     {
                                        /* if we assume that consecutive packets would have the same PID in most cases,