Changeset 1922f6ad735550cfa8c8a5f137c01d24d0c85f1a for oggzcap/src/MyController.mm

Timestamp:

11/07/09 18:25:35 (3 years ago)

Author:

rgareus <rgareus@…>

Parents:

995608906db4087da46cca386bc0e195722cec23

Children:

d24a3d0f57280f1e5f99023156a42aa0c87103c9

git-committer:

rgareus <rgareus@CITU17.local> / 2009-11-07T19:25:35Z+0100

Message:

fixed desc/tags, using project name as mount point.

Files:

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

oggzcap/src/MyController.mm

@@ -268 +268 @@
         NSString *tmpIcecastIp = [outIcecastIPTF stringValue] ;
         int tmpIcecastPort = [outIcecastPortTF intValue] ;
-        NSString *tmpIcecastMount = [outIcecastMountTF stringValue] ;
+//      NSString *tmpIcecastMount = [outIcecastMountTF stringValue] ;
 
         NSString *tmpStrName   = [projectName stringValue] ;
@@ -274 +274 @@
         NSString *tmpStrDescr  = [projectDescr stringValue] ;
         NSString *tmpStrTags   = [projectLocation stringValue] ;
+        NSString *tmpStrAuthorURL = [NSString stringWithFormat:@"http://wiki.citu.info/users/%@",tmpStrAuthor];
+        NSString *tmpIcecastMount = [NSString stringWithFormat:@"%@.ogg",tmpStrName];
+#if 0
+//      tmpIcecastMount = [tmpIcecastMount stringByReplacingOccurancesOfString:@" " withString:@"_"]; // WTF 10.5 only
+        const char* cmount = [tmpIcecastMount UTF8String];
+#else
+        char* cmount = strdup([tmpIcecastMount UTF8String]);
+        char* tmp;
+        while (tmp=strchr(cmount, ' ')) {
+            *tmp='_';
+        }
+#endif
         
         [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)*strlen);
+        char *cmount = (char*)malloc(sizeof(char)*strlen(...));
         strcpy(cip, [tmpIcecastIp UTF8String]) ;
         strcpy(cmount, [tmpIcecastMount UTF8String]) ;
 */
         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) ;
+        const char* curl   = [tmpStrAuthorURL UTF8String];
+
+        int iceConnect = myOggfwd_init(cip, tmpIcecastPort, (const char*) cmount, cdesc, ctags, cname, curl) ;
         
         if(iceConnect==1) {
@@ -352 +361 @@
                 [outIcecastIPTF setEnabled:NO];
                 [outIcecastPortTF setEnabled:NO];
-                [outIcecastMountTF setEnabled:NO];
+//              [outIcecastMountTF setEnabled:NO];
                 [projectName setEnabled:NO];
                 [projectAuthor setEnabled:NO];
@@ -408 +417 @@
         [outIcecastIPTF setEnabled:YES];
         [outIcecastPortTF setEnabled:YES];
-        [outIcecastMountTF setEnabled:YES];
+//      [outIcecastMountTF setEnabled:YES];
         [projectName setEnabled:YES];
         [projectAuthor setEnabled:YES];