Index: macosx/Controller.mm
===================================================================
--- macosx/Controller.mm	(revision 1133)
+++ macosx/Controller.mm	(working copy)
@@ -1128,6 +1128,22 @@
         {
             /* We are just doing a standard full source scan, so we specify "0" to libhb */
             NSString *path = [[sheet filenames] objectAtIndex: 0];
+            
+            /* We check to see if this is a .eyetv package */
+            if ([[path pathExtension] isEqualToString: @"eyetv"])
+            {
+                /* We're looking at an EyeTV package - try to open its enclosed
+                .mpg media file */
+                NSString *mpgname;
+                int n = [[path stringByAppendingString: @"/"]
+                         completePathIntoString: &mpgname caseSensitive: NO
+                         matchesIntoArray: nil
+                         filterTypes: [NSArray arrayWithObject: @"mpg"]];
+                if (n > 0)
+                {
+                    path = mpgname;
+                }
+            }
             [self performScan:path scanTitleNum:0];   
         }
         
@@ -1249,6 +1265,12 @@
                 we have to use the title->dvd value so we get the proper name of the volume if a physical dvd is the source*/
                 sourceDisplayName = [NSString stringWithFormat:[[[NSString stringWithUTF8String: title->dvd] stringByDeletingLastPathComponent] lastPathComponent]];
             }
+            else if ([[NSString stringWithUTF8String: title->dvd] rangeOfString: @".eyetv/"].length != 0)
+            {
+                /* Use the name of the EyeTV package instead of the media file */
+                sourceDisplayName = [NSString stringWithFormat: @"%@",
+                                     [[[[NSString stringWithUTF8String: title->dvd] stringByDeletingLastPathComponent] lastPathComponent] stringByDeletingPathExtension]];
+            }
             else
             {
                 /* if not the VIDEO_TS Folder, we can assume the chosen folder is the source name */