Changeset 63f5355ba2b2e52bba2f4711e90306f3bbd42a3e

Timestamp:

03/15/11 14:58:34 (14 months ago)

Author:

Robin Gareus <rgareus@…>

Parents:

ba360a2d79ae08187e9c7d7ed973ac77c7c62a75

Children:

d172f177ff9e7ff75ed885b94cfbdeb9ccf34094

git-committer:

Robin Gareus <rgareus@priroda.local> / 2011-03-15T15:58:34Z+0100

Message:

oggZcap: added icecast2 username entry.

Location:

oggzcap/src

Files:

• MyController.h (modified) (1 diff)
• MyController.mm (modified) (5 diffs)
• videoout/encoder_example.c (modified) (2 diffs)

oggzcap/src/MyController.h

@@ -75 +75 @@
         IBOutlet NSTextField    *outIcecastIPTF, *outIcecastPortTF;
         IBOutlet NSTextField    *outIcecastPassword;
+        IBOutlet NSTextField    *outIcecastUsername;
 //      IBOutlet NSTextField    *outIcecastMountTF;
         IBOutlet NSTextField    *outBitrateTF, *outQualityTF ; // OUT video Parameters

oggzcap/src/MyController.mm

@@ -4 +4 @@
 
 extern "C" {
-        int myOggfwd_init( const char* outIceIp, int outIcePort, const char* outPassword, const char* outIceMount,
-                           const char *description, const char *genre, const char *name, const char *url );
+  int myOggfwd_init( const char* outIceIp, int outIcePort, 
+         const char *outUsername, const char *outPassword, 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) ;
@@ -259 +260 @@
 //      NSString *tmpIcecastMount = [outIcecastMountTF stringValue] ;
         NSString *tmpStrPassword = [outIcecastPassword stringValue] ;
+        NSString *tmpStrUsername = [outIcecastUsername stringValue] ;
 
         NSString *tmpStrName   = [projectName stringValue] ;
@@ -290 +292 @@
         const char* curl   = [tmpStrAuthorURL UTF8String];
         const char* cpass  = [tmpStrPassword UTF8String];
-
-        int iceConnect = myOggfwd_init(cip, tmpIcecastPort, "inoutsource", (const char*) cmount, cdesc, ctags, cname, curl) ;
+        const char* user   = [tmpStrUsername UTF8String];
+
+        int iceConnect = myOggfwd_init(cip, tmpIcecastPort, strlen(user)?user:NULL, cpass, (const char*) cmount, cdesc, ctags, cname, curl) ;
         
         if(iceConnect==1) {
@@ -355 +358 @@
 //              [outIcecastMountTF setEnabled:NO];
                 [outIcecastPassword setEnabled:NO];
+                [outIcecastUsername setEnabled:NO];
                 [projectName setEnabled:NO];
                 [projectAuthor setEnabled:NO];
@@ -412 +416 @@
         [outIcecastPortTF setEnabled:YES];
         [outIcecastPassword setEnabled:YES];
+        [outIcecastUsername setEnabled:YES];
 //      [outIcecastMountTF setEnabled:YES];
         [projectName setEnabled:YES];

oggzcap/src/videoout/encoder_example.c

@@ -278 +278 @@
 shout_t     *myShout;
 //FILE          *outTestFile ;
-int myOggfwd_init( const char* outIceIp, int outIcePort, const char* outPassword, const char* outIceMount,
+int myOggfwd_init( const char* outIceIp, int outIcePort, 
+                         const char *outUsername, const char *outPassword, const char *outIceMount,
                    const char *description, const char *genre, const char *name, const char *url ) {
         
@@ -288 +289 @@
         if (shout_set_host(myShout, outIceIp) != SHOUTERR_SUCCESS) printf("oggfwd - Error - set host pb...%s\n",shout_get_error(myShout)) ;
         if (shout_set_port(myShout, port) != SHOUTERR_SUCCESS) printf("oggfwd - Error - look at the code to know...\n") ;
+        if (outUsername && shout_set_user(myShout, outUsername) != SHOUTERR_SUCCESS) printf("oggfwd - Error - look at the code to know...\n") ;
         if (shout_set_password(myShout, outPassword) != SHOUTERR_SUCCESS) printf("oggfwd - Error - look at the code to know...\n") ;
         if (shout_set_mount(myShout, outIceMount) != SHOUTERR_SUCCESS) printf("oggfwd - Error - look at the code to know...\n") ;