Changeset 2080ee9782dad606de14687d58f7902e707ecb96 for oggzcap/src/MyController.mm

Timestamp:

11/06/09 14:33:37 (3 years ago)

Author:

rgareus <rgareus@…>

Parents:

6ad46b97c08fbff92c569737162513719a8cee8d

Children:

c921505c5ad730161fe4d8eb95950eb4a3f30173

git-committer:

rgareus <rgareus@CITU-Cuboute.local> / 2009-11-06T15:33:37Z+0100

Message:

various updates..

Files:

• oggzcap/src/MyController.mm (modified) (5 diffs)

oggzcap/src/MyController.mm

@@ -4 +4 @@
 
 extern "C" {
-        int myOggfwd_init( char* outIceIp, int outIcePort, char* outIceMount ) ;
+        int myOggfwd_init( const char* outIceIp, int outIcePort, const char* outIceMount,
+                           const char *description, const char *genre, const char *name, const char *url );             
         void myOggfwd_close() ;
         void encoder_example_init(int inW, int inH, int inFramerate, int in_video_r, int in_video_q) ;
@@ -261 +262 @@
 }
 
--(void)stopIn
-{
-        [self pLog:@"Stopping Video In...\n"] ;
-        
-        ////////////////// Temp exchange File Things
-        inoutExchangeFile = fopen("/InOut/Config/InOutComponent/InOutComponentControl.txt", "wb") ;
-        char wBuff[] = {'0','\n','\n','\n'} ; 
-        fwrite(wBuff,1,4,inoutExchangeFile) ;
-        if(inoutExchangeFile) fclose(inoutExchangeFile) ;
-        
-        inListening = FALSE ;
-        
-        ////////////////// REMOVE VIEWER if toggle on
-        if(showInPreview) [self closeInPreview] ;
-        
-        ////////////////// Clear Display
-        [self clearInDisplay] ;
-                
-        [startInButton setEnabled:YES];
-        [stopInButton setEnabled:NO];
-}
-
-- (void)openInPreview
-{
-        printf("INOUT - Open InPreview Window\n") ;
-        
-        if (!videOpened) {
-                vide = [[SGVideo alloc] initWithSeqGrab:mGrabber myView:inPreviewView];
-                if(vide!=nil) {
-                        videOpened = TRUE ;
-                        [vide setUsage:seqGrabPreview + seqGrabRecord + seqGrabPlayDuringRecord];
-                        [mGrabber preview];
-                }
-                else {
-                        NSRunAlertPanel(@"Video Input Problem", 
-            @"Couldn't create a video channel.  Check your video device connections and try again.",
-            nil, nil, nil);
-                }
-        }
-        else {
-                [mGrabber preview];
-        }
-        //if(vide!=nil) [vide release]; // it was retained by its mGrabber
-}
-- (void)closeInPreview
-{
-        printf("INOUT - Close InPreview Window\n") ;
-        
-        [mGrabber stop];
-        
-        //SGChan* doomedChan = [[mGrabber channels] objectAtIndex:myIndex];
-        //[mGrabber removeChannel:doomedChan];
-}
-
 -(void)startOut
 {       
@@ -322 +269 @@
         int tmpIcecastPort = [outIcecastPortTF intValue] ;
         NSString *tmpIcecastMount = [outIcecastMountTF stringValue] ;
+
+        NSString *tmpStrName   = [projectName stringValue] ;
+        NSString *tmpStrAuthor = [projectAuthor stringValue] ; 
+        NSString *tmpStrDescr  = [projectDescr stringValue] ;
+        NSString *tmpStrTags   = [projectLocation stringValue] ;
         
         [self pLog:[NSString stringWithFormat:@"Starting Video Out to Icecast2 server:\n  http://%@:%d/%@\n",tmpIcecastIp,tmpIcecastPort,tmpIcecastMount]] ;
-
+/*
         char *cip = (char*)malloc(sizeof(char)*99);
-        char *cmount = (char*)malloc(sizeof(char)*99);
+        char *cmount = (char*)malloc(sizeof(char)*strlen);
         strcpy(cip, [tmpIcecastIp UTF8String]) ;
         strcpy(cmount, [tmpIcecastMount UTF8String]) ;
-        
-        int iceConnect = myOggfwd_init(cip, tmpIcecastPort, cmount) ;
+*/
+        const char* cip    = [tmpIcecastIp UTF8String];
+        const char* cmount = [tmpIcecastMount UTF8String];
+        const char* cname  = [tmpStrName UTF8String];
+        const char* cdesc  = [tmpStrDescr UTF8String];
+        const char* ctags  = [tmpStrTags UTF8String];
+        const char* curl   = [[NSString stringWithFormat:@"http://wiki.citu.info/users/%@\n",tmpStrAuthor] UTF8String] ; // TODO url-escape
+        
+        [self pLog:[NSString stringWithFormat:@"Tags: %@\nDesc: %@\n",tmpStrTags,tmpStrDescr]] ;
+
+        int iceConnect = myOggfwd_init(cip, tmpIcecastPort, cmount, cdesc, ctags, cname, curl) ;
         
         if(iceConnect==1) {
@@ -387 +348 @@
                 //[showZoneButton setEnabled:NO];
                 
+                [outBitrateTF setEnabled:NO];
+                [outQualityTF setEnabled:NO];
+                [outIcecastIPTF setEnabled:NO];
+                [outIcecastPortTF setEnabled:NO];
+                [outIcecastMountTF setEnabled:NO];
+                [projectName setEnabled:NO];
+                [projectAuthor setEnabled:NO];
+                [projectLocation setEnabled:NO];
+                [projectDescr setEnabled:NO];
+
                 [self setCaptureWindowMode:TRUE] ;
                 [mCaptureTarget makeKeyAndOrderFront:self];
@@ -432 +403 @@
         [stopOutButton setEnabled:NO];
         [showZoneButton setEnabled:YES];
-        
+
+        [outBitrateTF setEnabled:YES];
+        [outQualityTF setEnabled:YES];
+        [outIcecastIPTF setEnabled:YES];
+        [outIcecastPortTF setEnabled:YES];
+        [outIcecastMountTF setEnabled:YES];
+        [projectName setEnabled:YES];
+        [projectAuthor setEnabled:YES];
+        [projectLocation setEnabled:YES];
+        [projectDescr setEnabled:YES];
+
         [mCaptureTarget close];
 }