summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorRodeo <[email protected]>2013-06-03 15:37:38 +0000
committerRodeo <[email protected]>2013-06-03 15:37:38 +0000
commit16deb214281cd72ffaf2a11d3a5556c5b950a966 (patch)
treef673787fe7a92a894ec2ccace325af298831ef92 /macosx
parent812134ffba931aa603e67f541e7a2f0f03215fbb (diff)
libhb/common: improve fallback mechanism.
API changes: - added hb_global_init(), must be called before any other libhb function - removed (somewhat pointless) hb_mixdown_t.internal_name - some hb_*_get_from_name() functions now return 0 instead of -1. Instead of hardcoded fallbacks, list items now have a specific fallback, and a generic ID for when the specific fallback is unavailable. Encoder availability is checked at runtime (hb_global_init calling hb_common_global_init) and the item's value/fallback is sanity-checked and updated if necessary. See https://reviews.handbrake.fr/r/506/ for more detailed information. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5547 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Controller.m2
-rw-r--r--macosx/HBAudio.m2
-rw-r--r--macosx/main.mm7
3 files changed, 6 insertions, 5 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 34891e878..d5dd32bff 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -701,7 +701,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
menuItem = [[fVidRatePopUp menu] addItemWithTitle:@"Same as source"
action:nil
keyEquivalent:@""];
- [menuItem setTag:-1]; // hb_video_framerate_get_from_name(NULL)
+ [menuItem setTag:hb_video_framerate_get_from_name("Same as source")];
for (const hb_rate_t *video_framerate = hb_video_framerate_get_next(NULL);
video_framerate != NULL;
video_framerate = hb_video_framerate_get_next(video_framerate))
diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m
index 999aa9434..b6a987f31 100644
--- a/macosx/HBAudio.m
+++ b/macosx/HBAudio.m
@@ -64,7 +64,7 @@ static NSMutableArray *masterBitRateArray = nil;
#pragma mark -
#pragma mark Object Setup
-+ (void) load
++ (void) initialize
{
if ([HBAudio class] == self)
diff --git a/macosx/main.mm b/macosx/main.mm
index 24cd7547f..bc5159fae 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -64,9 +64,10 @@ char * str_printf(const char *fmt, ...)
}
}
-int main( int argc, const char ** argv )
+int main(int argc, const char **argv)
{
- signal( SIGINT, SigHandler );
+ signal(SIGINT, SigHandler);
+ hb_global_init();
hb_register_error_handler(&hb_error_handler);
- return NSApplicationMain( argc, argv );
+ return NSApplicationMain(argc, argv);
}