Commit: f05618bb296fb2bcb43f0494826010d3328136bc - handbrake-jp-git (git)

githubのコードからのfolk

Commit MetaInfo

• Revision: f05618bb296fb2bcb43f0494826010d3328136bc (tree)
• Time: 2011-02-27 01:48:04
• Author: sr55 <sr55@b64f...>
• Commiter: sr55

Log Message

Remove the set cpu count option as it doesn't do anything now

git-svn-id: svn://localhost/HandBrake/trunk@3812 b64f7644-9d1e-0410-96f1-a4d463321fa5

Change Summary

• modified: libhb/hb.c
• modified: libhb/hb.h
• modified: macosx/HandBrake.xcodeproj/project.pbxproj
• modified: test/test.c

Incremental Difference

--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -525,18 +525,6 @@ int hb_check_update( hb_handle_t * h, char ** version )
 }
 
 /**
- * Sets the cpu count to the desired value.
- * @param h Handle to hb_handle_t
- * @param cpu_count Number of CPUs to use.
- */
-void hb_set_cpu_count( hb_handle_t * h, int cpu_count )
-{
-    cpu_count    = MAX( 1, cpu_count );
-    cpu_count    = MIN( cpu_count, 64 );
-    h->cpu_count = cpu_count;
-}
-
-/**
  * Deletes current previews associated with titles
  * @param h Handle to hb_handle_t
  */

--- a/libhb/hb.h
+++ b/libhb/hb.h
@@ -28,11 +28,6 @@ int           hb_get_build( hb_handle_t * );
    negative value otherwise. */
 int           hb_check_update( hb_handle_t * h, char ** version );
 
-/* hb_set_cpu_count()
-   Force libhb to act as if you had X CPU(s).
-   Default is to use the detected count (see also hb_get_cpu_count() in
-   ports.h) */
-void          hb_set_cpu_count( hb_handle_t *, int );
 
 char *        hb_dvd_name( char * path );
 void          hb_dvd_set_dvdnav( int enable );

--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -540,6 +540,7 @@
 			};
 			buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,

--- a/test/test.c
+++ b/test/test.c
@@ -91,7 +91,6 @@ static int    subtitle_scan = 0;
 static int    width       = 0;
 static int    height      = 0;
 static int    crop[4]     = { -1,-1,-1,-1 };
-static int    cpu         = 0;
 static int    vrate       = 0;
 static float  vquality    = -1.0;
 static int    vbitrate    = 0;
@@ -229,12 +228,6 @@ int main( int argc, char ** argv )
     /* Geeky */
     fprintf( stderr, "%d CPU%s detected\n", hb_get_cpu_count(),
              hb_get_cpu_count( h ) > 1 ? "s" : "" );
-    if( cpu )
-    {
-        fprintf( stderr, "Forcing %d CPU%s\n", cpu,
-                 cpu > 1 ? "s" : "" );
-        hb_set_cpu_count( h, cpu );
-    }
 
     /* Exit ASAP on Ctrl-C */
     signal( SIGINT, SigHandler );
@@ -2428,7 +2421,6 @@ static void ShowHelp()
     "    -h, --help              Print help\n"
     "    -u, --update            Check for updates and exit\n"
     "    -v, --verbose <#>       Be verbose (optional argument: logging level)\n"
-    "    -C, --cpu               Set CPU count (default: autodetected)\n"
     "    -Z. --preset <string>   Use a built-in preset. Capitalization matters, and\n"
     "                            if the preset name has spaces, surround it with\n"
     "                            double quotation marks\n"
@@ -2803,7 +2795,6 @@ static int ParseOptions( int argc, char ** argv )
             { "help",        no_argument,       NULL,    'h' },
             { "update",      no_argument,       NULL,    'u' },
             { "verbose",     optional_argument, NULL,    'v' },
-            { "cpu",         required_argument, NULL,    'C' },
             { "no-dvdnav",      no_argument,       NULL,    DVDNAV },
 
             { "format",      required_argument, NULL,    'f' },
@@ -2919,10 +2910,6 @@ static int ParseOptions( int argc, char ** argv )
                     debug = 1;
                 }
                 break;
-            case 'C':
-                cpu = atoi( optarg );
-                break;
-
             case 'Z':
                 preset = 1;
                 preset_name = strdup(optarg);