Show
Ignore:
Timestamp:
02/24/10 00:46:12 (2 years ago)
Author:
Robin Gareus <rgareus@…>
Parents:
b05f1efa827beabba2d4dd6d7e9298cdb56c25ef
Children:
2f7b6650795d38c763f324a167de2027135b725b, fd4d779342a16f50de84c3747aaede85d3953f77
git-committer:
Robin Gareus <rgareus@priroda.local> / 2010-02-24T01:46:12Z+0100
Message:

OggZCap: allow re-size; improved build env.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • oggzcap/src/MyController.mm

    r66e0a72 r53f2ac9  
    44 
    55extern "C" { 
    6         int myOggfwd_init( const char* outIceIp, int outIcePort, const char* outIceMount, 
    7                            const char *description, const char *genre, const char *name, const char *url );              
     6        int myOggfwd_init( const char* outIceIp, int outIcePort, const char* outPassword, const char* outIceMount, 
     7                           const char *description, const char *genre, const char *name, const char *url ); 
    88        void myOggfwd_close() ; 
    99        void encoder_example_init(int inW, int inH, int inFramerate, int in_video_r, int in_video_q) ; 
    … …  
    189189-(void)initINOUT 
    190190{ 
    191         [self pLog:@"[MyController] GENERAL INIT...\n"] ; 
     191        [self pLog:@"[OggZCap] Initialization..\n"] ; 
    192192         
    193193//      NSRect srcRect = NSMakeRect(0, 0, 320, 240); 
    … …  
    258258        int tmpIcecastPort = [outIcecastPortTF intValue] ; 
    259259//      NSString *tmpIcecastMount = [outIcecastMountTF stringValue] ; 
     260        NSString *tmpStrPassword = [outIcecastPassword stringValue] ; 
    260261 
    261262        NSString *tmpStrName   = [projectName stringValue] ; 
    … …  
    288289        const char* ctags  = [tmpStrTags UTF8String]; 
    289290        const char* curl   = [tmpStrAuthorURL UTF8String]; 
    290  
    291         int iceConnect = myOggfwd_init(cip, tmpIcecastPort, (const char*) cmount, cdesc, ctags, cname, curl) ; 
     291        const char* cpass  = [tmpStrPassword UTF8String]; 
     292 
     293        int iceConnect = myOggfwd_init(cip, tmpIcecastPort, "inoutsource", (const char*) cmount, cdesc, ctags, cname, curl) ; 
    292294         
    293295        if(iceConnect==1) { 
    … …  
    344346                [startOutButton setEnabled:NO]; 
    345347                [stopOutButton setEnabled:YES]; 
     348                [resizeRadio setEnabled:NO]; 
    346349                //[showZoneButton setEnabled:NO]; 
    347350                 
    … …  
    351354                [outIcecastPortTF setEnabled:NO]; 
    352355//              [outIcecastMountTF setEnabled:NO]; 
     356                [outIcecastPassword setEnabled:NO]; 
    353357                [projectName setEnabled:NO]; 
    354358                [projectAuthor setEnabled:NO]; 
    … …  
    401405        [stopOutButton setEnabled:NO]; 
    402406        [showZoneButton setEnabled:YES]; 
     407        [resizeRadio setEnabled:YES]; 
    403408 
    404409        [outBitrateTF setEnabled:YES]; 
    … …  
    406411        [outIcecastIPTF setEnabled:YES]; 
    407412        [outIcecastPortTF setEnabled:YES]; 
     413        [outIcecastPassword setEnabled:YES]; 
    408414//      [outIcecastMountTF setEnabled:YES]; 
    409415        [projectName setEnabled:YES]; 
    … …  
    659665        /// Display size and location 
    660666        //printf("INOUT - : pos = %d\n", rowS ); 
     667        [self pLog:[NSString stringWithFormat:@"Capture Size: %d:%d\n", newW, newH]] ; 
    661668} 
    662669