Changeset 41dcfc0d39c224f0f2aef6cb2c5fc6541643e4b4
- Timestamp:
- 11/30/09 14:33:50 (2 years ago)
- Parents:
- 8c0c8a9b0b39b3ceb42fd0721598b8f6bc4c3175, d24a3d0f57280f1e5f99023156a42aa0c87103c9
- Children:
- 9fd29776ea63427fec80b3e34e0e52abfa924b53, e4e203671406cf05793d8bdd3f90000f29767307
- git-committer:
- Robin Gareus <robin@gareus.org> / 2009-11-30T15:33:50Z+0100
- Files:
-
- 1 added
- 10 modified
-
oggzcap/English.lproj/MainMenu.nib/designable.nib (modified) (18 diffs)
-
oggzcap/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
-
oggzcap/OggZCap.xcodeproj/rgareus.mode1v3 (modified) (17 diffs)
-
oggzcap/OggZCap.xcodeproj/rgareus.pbxuser (modified) (7 diffs)
-
oggzcap/buildmac.sh (modified) (2 diffs)
-
oggzcap/src/MyController.h (modified) (1 diff)
-
oggzcap/src/MyController.mm (modified) (4 diffs)
-
flex/inout-av/src/main.mxml (modified) (7 diffs)
-
misc/loop.sh (added)
-
misc/red5/myenc.sh (modified) (3 diffs)
-
qio/inout.pro (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
oggzcap/English.lproj/MainMenu.nib/designable.nib
r2080ee9 rd24a3d0 9 9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 10 10 <bool key="EncodedWithXMLCoder">YES</bool> 11 <integer value=" 221"/>11 <integer value="1690"/> 12 12 </object> 13 13 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 770 770 <reference key="NSNextResponder" ref="880481198"/> 771 771 <int key="NSvFlags">256</int> 772 <string key="NSFrame">{{66, 69}, {103, 19}}</string>772 <string key="NSFrame">{{66, 37}, {103, 19}}</string> 773 773 <reference key="NSSuperview" ref="880481198"/> 774 774 <bool key="NSEnabled">YES</bool> … … 776 776 <int key="NSCellFlags">-1804468671</int> 777 777 <int key="NSCellFlags2">272761856</int> 778 <string key="NSContents"> theartcollider.net</string>778 <string key="NSContents">artcollider.sfai.edu</string> 779 779 <reference key="NSSupport" ref="26"/> 780 780 <reference key="NSControlView" ref="835369499"/> … … 787 787 <reference key="NSNextResponder" ref="880481198"/> 788 788 <int key="NSvFlags">256</int> 789 <string key="NSFrame">{{66, 46}, {36, 19}}</string>789 <string key="NSFrame">{{66, 14}, {36, 19}}</string> 790 790 <reference key="NSSuperview" ref="880481198"/> 791 791 <bool key="NSEnabled">YES</bool> … … 793 793 <int key="NSCellFlags">-1804468671</int> 794 794 <int key="NSCellFlags2">272761856</int> 795 <string key="NSContents">800 2</string>795 <string key="NSContents">8000</string> 796 796 <reference key="NSSupport" ref="26"/> 797 797 <reference key="NSControlView" ref="66106867"/> 798 <bool key="NSDrawsBackground">YES</bool>799 <reference key="NSBackgroundColor" ref="318613119"/>800 <reference key="NSTextColor" ref="84829848"/>801 </object>802 </object>803 <object class="NSTextField" id="60860064">804 <reference key="NSNextResponder" ref="880481198"/>805 <int key="NSvFlags">256</int>806 <string key="NSFrame">{{66, 21}, {103, 19}}</string>807 <reference key="NSSuperview" ref="880481198"/>808 <bool key="NSEnabled">YES</bool>809 <object class="NSTextFieldCell" key="NSCell" id="455780454">810 <int key="NSCellFlags">-1804468671</int>811 <int key="NSCellFlags2">272761856</int>812 <string key="NSContents">inoutvideo.ogg</string>813 <reference key="NSSupport" ref="26"/>814 <reference key="NSControlView" ref="60860064"/>815 798 <bool key="NSDrawsBackground">YES</bool> 816 799 <reference key="NSBackgroundColor" ref="318613119"/> … … 821 804 <reference key="NSNextResponder" ref="880481198"/> 822 805 <int key="NSvFlags">268</int> 823 <string key="NSFrame">{{25, 69}, {43, 17}}</string>806 <string key="NSFrame">{{25, 37}, {43, 17}}</string> 824 807 <reference key="NSSuperview" ref="880481198"/> 825 808 <bool key="NSEnabled">YES</bool> … … 837 820 <reference key="NSNextResponder" ref="880481198"/> 838 821 <int key="NSvFlags">268</int> 839 <string key="NSFrame">{{34, 46}, {38, 14}}</string>822 <string key="NSFrame">{{34, 14}, {38, 14}}</string> 840 823 <reference key="NSSuperview" ref="880481198"/> 841 824 <bool key="NSEnabled">YES</bool> … … 850 833 </object> 851 834 </object> 852 <object class="NSTextField" id="864759751">853 <reference key="NSNextResponder" ref="880481198"/>854 <int key="NSvFlags">268</int>855 <string key="NSFrame">{{23, 21}, {38, 14}}</string>856 <reference key="NSSuperview" ref="880481198"/>857 <bool key="NSEnabled">YES</bool>858 <object class="NSTextFieldCell" key="NSCell" id="263708606">859 <int key="NSCellFlags">68288064</int>860 <int key="NSCellFlags2">272761856</int>861 <string key="NSContents">Mount</string>862 <reference key="NSSupport" ref="26"/>863 <reference key="NSControlView" ref="864759751"/>864 <reference key="NSBackgroundColor" ref="837170776"/>865 <reference key="NSTextColor" ref="333012438"/>866 </object>867 </object>868 835 </object> 869 <string key="NSFrame">{{1, 1}, {196, 98}}</string>836 <string key="NSFrame">{{1, 1}, {196, 66}}</string> 870 837 <reference key="NSSuperview" ref="187096855"/> 871 838 </object> 872 839 </object> 873 <string key="NSFrame">{{13, 123}, {198, 114}}</string>840 <string key="NSFrame">{{13, 123}, {198, 82}}</string> 874 841 <reference key="NSSuperview" ref="830123516"/> 875 842 <string key="NSOffsets">{0, 0}</string> … … 1044 1011 <int key="NSCellFlags">67239424</int> 1045 1012 <int key="NSCellFlags2">0</int> 1046 <string key="NSContents"> Meta Data</string>1013 <string key="NSContents">Video Meta Data</string> 1047 1014 <reference key="NSSupport" ref="26"/> 1048 1015 <reference key="NSBackgroundColor" ref="318613119"/> … … 2090 2057 <object class="IBConnectionRecord"> 2091 2058 <object class="IBOutletConnection" key="connection"> 2092 <string key="label">outIcecastMountTF</string>2093 <reference key="source" ref="57871222"/>2094 <reference key="destination" ref="60860064"/>2095 </object>2096 <int key="connectionID">1753</int>2097 </object>2098 <object class="IBConnectionRecord">2099 <object class="IBOutletConnection" key="connection">2100 2059 <string key="label">outBitrateTF</string> 2101 2060 <reference key="source" ref="57871222"/> … … 3100 3059 <reference ref="367891636"/> 3101 3060 <reference ref="953464959"/> 3102 <reference ref="60860064"/>3103 <reference ref="864759751"/>3104 3061 </object> 3105 3062 <reference key="parent" ref="830123516"/> … … 3134 3091 </object> 3135 3092 <object class="IBObjectRecord"> 3136 <int key="objectID">1686</int>3137 <reference key="object" ref="60860064"/>3138 <object class="NSMutableArray" key="children">3139 <bool key="EncodedWithXMLCoder">YES</bool>3140 <reference ref="455780454"/>3141 </object>3142 <reference key="parent" ref="187096855"/>3143 </object>3144 <object class="IBObjectRecord">3145 <int key="objectID">1691</int>3146 <reference key="object" ref="455780454"/>3147 <reference key="parent" ref="60860064"/>3148 </object>3149 <object class="IBObjectRecord">3150 3093 <int key="objectID">1685</int> 3151 3094 <reference key="object" ref="367891636"/> … … 3174 3117 <reference key="object" ref="31038784"/> 3175 3118 <reference key="parent" ref="953464959"/> 3176 </object>3177 <object class="IBObjectRecord">3178 <int key="objectID">1683</int>3179 <reference key="object" ref="864759751"/>3180 <object class="NSMutableArray" key="children">3181 <bool key="EncodedWithXMLCoder">YES</bool>3182 <reference ref="263708606"/>3183 </object>3184 <reference key="parent" ref="187096855"/>3185 </object>3186 <object class="IBObjectRecord">3187 <int key="objectID">1694</int>3188 <reference key="object" ref="263708606"/>3189 <reference key="parent" ref="864759751"/>3190 3119 </object> 3191 3120 </object> … … 3291 3220 <string>1675.ImportedFromIB2</string> 3292 3221 <string>1682.IBPluginDependency</string> 3293 <string>1683.IBPluginDependency</string>3294 3222 <string>1684.IBPluginDependency</string> 3295 3223 <string>1685.IBPluginDependency</string> 3296 <string>1686.IBPluginDependency</string>3297 <string>1686.ImportedFromIB2</string>3298 3224 <string>1687.IBPluginDependency</string> 3299 3225 <string>1687.ImportedFromIB2</string> … … 3302 3228 <string>1689.IBPluginDependency</string> 3303 3229 <string>1690.IBPluginDependency</string> 3304 <string>1691.IBPluginDependency</string>3305 3230 <string>1692.IBPluginDependency</string> 3306 3231 <string>1693.IBPluginDependency</string> 3307 <string>1694.IBPluginDependency</string>3308 3232 <string>1701.IBPluginDependency</string> 3309 3233 <string>1701.ImportedFromIB2</string> … … 3536 3460 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3537 3461 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3538 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3539 <reference ref="9"/> 3540 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3541 <reference ref="9"/> 3542 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3543 <reference ref="9"/> 3544 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3545 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3546 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3547 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3548 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3549 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3550 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3551 <reference ref="9"/> 3552 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3553 <reference ref="9"/> 3554 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3555 <reference ref="9"/> 3556 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3557 <reference ref="9"/> 3558 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3559 <reference ref="9"/> 3560 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3561 <reference ref="9"/> 3562 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3563 <reference ref="9"/> 3564 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3565 <reference ref="9"/> 3566 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3567 <reference ref="9"/> 3568 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3569 <reference ref="9"/> 3570 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3571 <reference ref="9"/> 3572 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3573 <reference ref="9"/> 3574 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3575 <reference ref="9"/> 3576 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3577 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3578 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3579 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3580 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3581 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3582 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3583 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3584 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3585 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3586 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3587 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3588 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3589 <reference ref="9"/> 3590 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3591 <reference ref="9"/> 3592 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3593 <reference ref="9"/> 3594 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3595 <reference ref="9"/> 3596 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3597 <reference ref="9"/> 3598 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3599 <reference ref="9"/> 3600 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3601 <reference ref="9"/> 3602 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3603 <reference ref="9"/> 3604 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3605 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3606 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3607 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3608 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3609 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3610 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3611 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3612 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3613 <reference ref="9"/> 3614 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3615 <reference ref="9"/> 3616 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3617 <reference ref="9"/> 3618 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3619 <reference ref="9"/> 3620 <string>{{257, 229}, {439, 412}}</string> 3621 <string>{{257, 229}, {439, 412}}</string> 3462 <reference ref="9"/> 3463 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3464 <reference ref="9"/> 3465 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3466 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3467 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3468 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3469 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3470 <reference ref="9"/> 3471 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3472 <reference ref="9"/> 3473 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3474 <reference ref="9"/> 3475 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3476 <reference ref="9"/> 3477 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3478 <reference ref="9"/> 3479 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3480 <reference ref="9"/> 3481 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3482 <reference ref="9"/> 3483 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3484 <reference ref="9"/> 3485 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3486 <reference ref="9"/> 3487 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3488 <reference ref="9"/> 3489 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3490 <reference ref="9"/> 3491 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3492 <reference ref="9"/> 3493 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3494 <reference ref="9"/> 3495 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3496 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3497 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3498 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3499 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3500 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3501 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3502 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3503 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3504 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3505 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3506 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3507 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3508 <reference ref="9"/> 3509 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3510 <reference ref="9"/> 3511 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3512 <reference ref="9"/> 3513 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3514 <reference ref="9"/> 3515 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3516 <reference ref="9"/> 3517 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3518 <reference ref="9"/> 3519 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3520 <reference ref="9"/> 3521 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3522 <reference ref="9"/> 3523 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3524 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3525 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3526 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3527 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3528 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3529 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3530 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3531 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3532 <reference ref="9"/> 3533 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3534 <reference ref="9"/> 3535 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3536 <reference ref="9"/> 3537 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 3538 <reference ref="9"/> 3539 <string>{{68, 257}, {439, 412}}</string> 3540 <string>{{68, 257}, {439, 412}}</string> 3622 3541 <reference ref="9"/> 3623 3542 <reference ref="9"/> … … 3759 3678 <string>outFramerateDisplayed</string> 3760 3679 <string>outIcecastIPTF</string> 3761 <string>outIcecastMountTF</string>3762 3680 <string>outIcecastPortTF</string> 3763 3681 <string>outPreviewView</string> … … 3791 3709 <string>id</string> 3792 3710 <string>id</string> 3793 <string>NSTextField</string>3794 3711 <string>NSTextField</string> 3795 3712 <string>NSTextField</string> -
oggzcap/OggZCap.xcodeproj/rgareus.mode1v3
r6ad46b9 rd24a3d0 271 271 <string>29B97314FDCFA39411CA2CEA</string> 272 272 <string>080E96DDFE201D6D7F000001</string> 273 <string>29B97317FDCFA39411CA2CEA</string> 273 274 <string>1C37FBAC04509CD000000102</string> 274 275 <string>1C37FAAC04509CD000000102</string> … … 278 279 <array> 279 280 <array> 280 <integer>16</integer> 281 <integer>15</integer> 281 <integer>0</integer> 282 282 </array> 283 283 </array> … … 302 302 </array> 303 303 <key>RubberWindowFrame</key> 304 <string> 135 175793 695 0 0 1440 878 </string>304 <string>601 154 793 695 0 0 1440 878 </string> 305 305 </dict> 306 306 <key>Module</key> … … 318 318 <string>1CE0B20306471E060097A5F4</string> 319 319 <key>PBXProjectModuleLabel</key> 320 <string>MyController. h</string>320 <string>MyController.mm</string> 321 321 <key>PBXSplitModuleInNavigatorKey</key> 322 322 <dict> … … 326 326 <string>1CE0B20406471E060097A5F4</string> 327 327 <key>PBXProjectModuleLabel</key> 328 <string>MyController. h</string>328 <string>MyController.mm</string> 329 329 <key>_historyCapacity</key> 330 330 <integer>0</integer> 331 331 <key>bookmark</key> 332 <string>B536 5F9710A3B16E00169082</string>332 <string>B536607B10A5F34500169082</string> 333 333 <key>history</key> 334 334 <array> 335 335 <string>B5D7340810A395840039782E</string> 336 336 <string>B5D7344D10A39D1D0039782E</string> 337 <string>B5 D7344E10A39D1D0039782E</string>338 <string>B5 D2DDAB10A3A513005BEB33</string>337 <string>B536607010A5F24B00169082</string> 338 <string>B536607110A5F24B00169082</string> 339 339 </array> 340 340 <key>prevStack</key> … … 343 343 <string>B5D7345010A39D1D0039782E</string> 344 344 <string>B5D7345110A39D1D0039782E</string> 345 <string>B536607210A5F24B00169082</string> 345 346 </array> 346 347 </dict> … … 354 355 <dict> 355 356 <key>Frame</key> 356 <string>{{0, 0}, {518, 512}}</string>357 <string>{{0, 0}, {518, 328}}</string> 357 358 <key>RubberWindowFrame</key> 358 <string> 135 175793 695 0 0 1440 878 </string>359 <string>601 154 793 695 0 0 1440 878 </string> 359 360 </dict> 360 361 <key>Module</key> 361 362 <string>PBXNavigatorGroup</string> 362 363 <key>Proportion</key> 363 <string> 512pt</string>364 <string>328pt</string> 364 365 </dict> 365 366 <dict> … … 374 375 <dict> 375 376 <key>Frame</key> 376 <string>{{0, 517}, {518, 137}}</string>377 <string>{{0, 333}, {518, 321}}</string> 377 378 <key>RubberWindowFrame</key> 378 <string> 135 175793 695 0 0 1440 878 </string>379 <string>601 154 793 695 0 0 1440 878 </string> 379 380 </dict> 380 381 <key>Module</key> 381 382 <string>XCDetailModule</string> 382 383 <key>Proportion</key> 383 <string> 137pt</string>384 <string>321pt</string> 384 385 </dict> 385 386 </array> … … 400 401 <key>TableOfContents</key> 401 402 <array> 402 <string>B536 5F9810A3B16E00169082</string>403 <string>B536607410A5F24B00169082</string> 403 404 <string>1CE0B1FE06471DED0097A5F4</string> 404 <string>B536 5F9910A3B16E00169082</string>405 <string>B536607510A5F24B00169082</string> 405 406 <string>1CE0B20306471E060097A5F4</string> 406 407 <string>1CE0B20506471E060097A5F4</string> … … 536 537 <key>WindowOrderList</key> 537 538 <array> 539 <string>B536607610A5F24B00169082</string> 540 <string>B536607710A5F24B00169082</string> 541 <string>1C78EAAD065D492600B07095</string> 542 <string>1CD10A99069EF8BA00B06720</string> 543 <string>B5D733AD10A3869C0039782E</string> 538 544 <string>/Users/rgareus/Data/inout/oggzcap/OggZCap.xcodeproj</string> 539 545 </array> 540 546 <key>WindowString</key> 541 <string> 135 175793 695 0 0 1440 878 </string>547 <string>601 154 793 695 0 0 1440 878 </string> 542 548 <key>WindowToolsV3</key> 543 549 <array> … … 560 566 <string>1CD0528F0623707200166675</string> 561 567 <key>PBXProjectModuleLabel</key> 562 <string> </string>568 <string>MyController.mm</string> 563 569 <key>StatusBarVisibility</key> 564 570 <true/> … … 618 624 <array> 619 625 <string>B5D733AD10A3869C0039782E</string> 620 <string>B5 D2DD9B10A3A409005BEB33</string>626 <string>B536606710A5F23F00169082</string> 621 627 <string>1CD0528F0623707200166675</string> 622 628 <string>XCMainBuildResultsModuleGUID</string> … … 660 666 <key>sizes</key> 661 667 <array> 662 <string>{{0, 0}, {316, 20 1}}</string>663 <string>{{316, 0}, {378, 20 1}}</string>668 <string>{{0, 0}, {316, 202}}</string> 669 <string>{{316, 0}, {378, 202}}</string> 664 670 </array> 665 671 </dict> … … 676 682 <key>sizes</key> 677 683 <array> 678 <string>{{0, 0}, {694, 20 1}}</string>679 <string>{{0, 20 1}, {694, 180}}</string>684 <string>{{0, 0}, {694, 202}}</string> 685 <string>{{0, 202}, {694, 179}}</string> 680 686 </array> 681 687 </dict> … … 710 716 </array> 711 717 <key>Frame</key> 712 <string>{{316, 0}, {378, 20 1}}</string>718 <string>{{316, 0}, {378, 202}}</string> 713 719 <key>RubberWindowFrame</key> 714 720 <string>634 401 694 422 0 0 1440 878 </string> … … 738 744 <array> 739 745 <string>1CD10A99069EF8BA00B06720</string> 740 <string>B5 D2DDAC10A3A513005BEB33</string>746 <string>B536606810A5F23F00169082</string> 741 747 <string>1C162984064C10D400B95A72</string> 742 <string>B5 D2DDAD10A3A513005BEB33</string>743 <string>B5 D2DDAE10A3A513005BEB33</string>744 <string>B5 D2DDAF10A3A513005BEB33</string>745 <string>B5 D2DDB010A3A513005BEB33</string>746 <string>B5 D2DDB110A3A513005BEB33</string>748 <string>B536606910A5F23F00169082</string> 749 <string>B536606A10A5F23F00169082</string> 750 <string>B536606B10A5F23F00169082</string> 751 <string>B536606C10A5F23F00169082</string> 752 <string>B536606D10A5F23F00169082</string> 747 753 </array> 748 754 <key>ToolbarConfiguration</key> … … 906 912 <array> 907 913 <string>1C78EAAD065D492600B07095</string> 908 <string>B5 D2DDB210A3A513005BEB33</string>914 <string>B536606E10A5F23F00169082</string> 909 915 <string>1C78EAAC065D492600B07095</string> 910 916 </array> -
oggzcap/OggZCap.xcodeproj/rgareus.pbxuser
r6ad46b9 rd24a3d0 125 125 ); 126 126 }; 127 PBXPerProjectTemplateStateSaveDate = 279 163243;128 PBXWorkspaceStateSaveDate = 279 163243;127 PBXPerProjectTemplateStateSaveDate = 279749772; 128 PBXWorkspaceStateSaveDate = 279749772; 129 129 }; 130 130 perUserProjectItems = { 131 B5365F9710A3B16E00169082 /* PBXTextBookmark */ = B5365F9710A3B16E00169082 /* PBXTextBookmark */; 132 B5D2DD9010A3A2CB005BEB33 = B5D2DD9010A3A2CB005BEB33 /* PBXTextBookmark */; 133 B5D2DDAB10A3A513005BEB33 = B5D2DDAB10A3A513005BEB33 /* PBXTextBookmark */; 131 B536607010A5F24B00169082 = B536607010A5F24B00169082 /* PBXTextBookmark */; 132 B536607110A5F24B00169082 = B536607110A5F24B00169082 /* PBXTextBookmark */; 133 B536607210A5F24B00169082 = B536607210A5F24B00169082 /* PBXTextBookmark */; 134 B536607B10A5F34500169082 = B536607B10A5F34500169082 /* PBXTextBookmark */; 134 135 B5D7340810A395840039782E = B5D7340810A395840039782E /* PBXTextBookmark */; 135 136 B5D7340B10A395840039782E = B5D7340B10A395840039782E /* PBXTextBookmark */; 136 137 B5D7344D10A39D1D0039782E = B5D7344D10A39D1D0039782E /* PBXTextBookmark */; 137 B5D7344E10A39D1D0039782E = B5D7344E10A39D1D0039782E /* PBXTextBookmark */;138 138 B5D7345010A39D1D0039782E = B5D7345010A39D1D0039782E /* PBXTextBookmark */; 139 139 B5D7345110A39D1D0039782E = B5D7345110A39D1D0039782E /* PBXTextBookmark */; … … 167 167 454398890D6F33A500761241 /* MyController.mm */ = { 168 168 uiCtxt = { 169 sepNavIntBoundsRect = "{{0, 0}, {9 96, 10722}}";170 sepNavSelRange = "{ 19616, 0}";171 sepNavVisRange = "{8 886, 1408}";169 sepNavIntBoundsRect = "{{0, 0}, {924, 9786}}"; 170 sepNavSelRange = "{21966, 0}"; 171 sepNavVisRange = "{8513, 731}"; 172 172 sepNavWindowFrame = "{{517, 97}, {778, 736}}"; 173 173 }; … … 175 175 4543988A0D6F33A500761241 /* MyController.h */ = { 176 176 uiCtxt = { 177 sepNavIntBoundsRect = "{{0, 0}, {588, 2 198}}";178 sepNavSelRange = "{3 502, 0}";179 sepNavVisRange = "{3 244, 876}";177 sepNavIntBoundsRect = "{{0, 0}, {588, 2086}}"; 178 sepNavSelRange = "{3928, 0}"; 179 sepNavVisRange = "{3127, 590}"; 180 180 sepNavWindowFrame = "{{103, 55}, {778, 736}}"; 181 181 }; … … 187 187 ); 188 188 }; 189 B536 5F9710A3B16E00169082 /* PBXTextBookmark */ = {189 B536607010A5F24B00169082 /* PBXTextBookmark */ = { 190 190 isa = PBXTextBookmark; 191 191 fRef = 4543988A0D6F33A500761241 /* MyController.h */; 192 name = "MyController.h: 119"; 193 rLen = 0; 194 rLoc = 3502; 195 rType = 0; 196 vrLen = 876; 197 vrLoc = 3244; 198 }; 199 B5D2DD9010A3A2CB005BEB33 /* PBXTextBookmark */ = { 192 name = "MyController.h: 145"; 193 rLen = 0; 194 rLoc = 3928; 195 rType = 0; 196 vrLen = 590; 197 vrLoc = 3127; 198 }; 199 B536607110A5F24B00169082 /* PBXTextBookmark */ = { 200 isa = PBXTextBookmark; 201 comments = "error: invalid conversion from 'const char*' to 'char*'"; 202 fRef = 454398890D6F33A500761241 /* MyController.mm */; 203 rLen = 1; 204 rLoc = 281; 205 rType = 1; 206 }; 207 B536607210A5F24B00169082 /* PBXTextBookmark */ = { 200 208 isa = PBXTextBookmark; 201 209 fRef = 4543988A0D6F33A500761241 /* MyController.h */; 202 name = "MyController.h: 1 19";203 rLen = 0; 204 rLoc = 3 502;205 rType = 0; 206 vrLen = 833;207 vrLoc = 3 287;208 }; 209 B5 D2DDAB10A3A513005BEB33/* PBXTextBookmark */ = {210 isa = PBXTextBookmark; 211 fRef = 4543988 A0D6F33A500761241 /* MyController.h*/;212 name = "MyController. h: 119";213 rLen = 0; 214 rLoc = 3502;215 rType = 0; 216 vrLen = 834;217 vrLoc = 3286;210 name = "MyController.h: 145"; 211 rLen = 0; 212 rLoc = 3928; 213 rType = 0; 214 vrLen = 590; 215 vrLoc = 3127; 216 }; 217 B536607B10A5F34500169082 /* PBXTextBookmark */ = { 218 isa = PBXTextBookmark; 219 fRef = 454398890D6F33A500761241 /* MyController.mm */; 220 name = "MyController.mm: 702"; 221 rLen = 0; 222 rLoc = 21966; 223 rType = 0; 224 vrLen = 1056; 225 vrLoc = 8395; 218 226 }; 219 227 B5D7339610A384CF0039782E /* OggZCap */ = { … … 238 246 libgmallocEnabled = 0; 239 247 name = OggZCap; 248 savedGlobals = { 249 }; 240 250 sourceDirectories = ( 241 251 ); … … 282 292 vrLoc = 13184; 283 293 }; 284 B5D7344E10A39D1D0039782E /* PBXTextBookmark */ = { 294 B5D7345010A39D1D0039782E /* PBXTextBookmark */ = { 295 isa = PBXTextBookmark; 296 fRef = 454398770D6F33A500761241 /* FrameReader.m */; 297 name = "FrameReader.m: 1"; 298 rLen = 0; 299 rLoc = 0; 300 rType = 0; 301 vrLen = 382; 302 vrLoc = 13184; 303 }; 304 B5D7345110A39D1D0039782E /* PBXTextBookmark */ = { 285 305 isa = PBXTextBookmark; 286 306 fRef = 454398890D6F33A500761241 /* MyController.mm */; … … 292 312 vrLoc = 0; 293 313 }; 294 B5D7345010A39D1D0039782E /* PBXTextBookmark */ = {295 isa = PBXTextBookmark;296 fRef = 454398770D6F33A500761241 /* FrameReader.m */;297 name = "FrameReader.m: 1";298 rLen = 0;299 rLoc = 0;300 rType = 0;301 vrLen = 382;302 vrLoc = 13184;303 };304 B5D7345110A39D1D0039782E /* PBXTextBookmark */ = {305 isa = PBXTextBookmark;306 fRef = 454398890D6F33A500761241 /* MyController.mm */;307 name = "MyController.mm: 16";308 rLen = 0;309 rLoc = 460;310 rType = 0;311 vrLen = 1169;312 vrLoc = 0;313 };314 314 } -
oggzcap/buildmac.sh
r9956089 rd24a3d0 1 1 #!/bin/sh 2 VERSION=0.2. 02 VERSION=0.2.2 3 3 DMGFILE=/tmp/oggzcap_v$VERSION.dmg 4 4 echo $DMGFILE 5 5 6 BUILD=build/Release/ movemovie.app6 BUILD=build/Release/OggZCap.app 7 7 8 8 xcodebuild clean \ … … 41 41 rmdir $MNTPATH 42 42 43 if [ -n "$1" ];then 44 scp $DMGFILE rg42.org:/var/sites/inout/docroot/software/ 45 fi -
oggzcap/src/MyController.h
rc921505 r1922f6a 74 74 NSTimer *outPreviewTimer; 75 75 76 IBOutlet NSTextField *outIcecastIPTF, *outIcecastPortTF, *outIcecastMountTF ; 76 IBOutlet NSTextField *outIcecastIPTF, *outIcecastPortTF; 77 // IBOutlet NSTextField *outIcecastMountTF ; 77 78 IBOutlet NSTextField *outBitrateTF, *outQualityTF ; // OUT video Parameters 78 79 -
oggzcap/src/MyController.mm
rc921505 r1922f6a 268 268 NSString *tmpIcecastIp = [outIcecastIPTF stringValue] ; 269 269 int tmpIcecastPort = [outIcecastPortTF intValue] ; 270 NSString *tmpIcecastMount = [outIcecastMountTF stringValue] ;270 // NSString *tmpIcecastMount = [outIcecastMountTF stringValue] ; 271 271 272 272 NSString *tmpStrName = [projectName stringValue] ; … … 274 274 NSString *tmpStrDescr = [projectDescr stringValue] ; 275 275 NSString *tmpStrTags = [projectLocation stringValue] ; 276 NSString *tmpStrAuthorURL = [NSString stringWithFormat:@"http://wiki.citu.info/users/%@",tmpStrAuthor]; 277 NSString *tmpIcecastMount = [NSString stringWithFormat:@"%@.ogg",tmpStrName]; 278 #if 0 279 // tmpIcecastMount = [tmpIcecastMount stringByReplacingOccurancesOfString:@" " withString:@"_"]; // WTF 10.5 only 280 const char* cmount = [tmpIcecastMount UTF8String]; 281 #else 282 char* cmount = strdup([tmpIcecastMount UTF8String]); 283 char* tmp; 284 while (tmp=strchr(cmount, ' ')) { 285 *tmp='_'; 286 } 287 #endif 276 288 277 289 [self pLog:[NSString stringWithFormat:@"Starting Video Out to Icecast2 server:\n http://%@:%d/%@\n",tmpIcecastIp,tmpIcecastPort,tmpIcecastMount]] ; 278 290 /* 279 291 char *cip = (char*)malloc(sizeof(char)*99); 280 char *cmount = (char*)malloc(sizeof(char)*strlen );292 char *cmount = (char*)malloc(sizeof(char)*strlen(...)); 281 293 strcpy(cip, [tmpIcecastIp UTF8String]) ; 282 294 strcpy(cmount, [tmpIcecastMount UTF8String]) ; 283 295 */ 284 296 const char* cip = [tmpIcecastIp UTF8String]; 285 const char* cmount = [tmpIcecastMount UTF8String];286 297 const char* cname = [tmpStrName UTF8String]; 287 298 const char* cdesc = [tmpStrDescr UTF8String]; 288 299 const char* ctags = [tmpStrTags UTF8String]; 289 const char* curl = [[NSString stringWithFormat:@"http://wiki.citu.info/users/%@\n",tmpStrAuthor] UTF8String] ; // TODO url-escape 290 291 // [self pLog:[NSString stringWithFormat:@"Tags: %@\nDesc: %@\n",tmpStrTags,tmpStrDescr]] ; 292 293 int iceConnect = myOggfwd_init(cip, tmpIcecastPort, cmount, cdesc, ctags, cname, curl) ; 300 const char* curl = [tmpStrAuthorURL UTF8String]; 301 302 int iceConnect = myOggfwd_init(cip, tmpIcecastPort, (const char*) cmount, cdesc, ctags, cname, curl) ; 294 303 295 304 if(iceConnect==1) { … … 352 361 [outIcecastIPTF setEnabled:NO]; 353 362 [outIcecastPortTF setEnabled:NO]; 354 [outIcecastMountTF setEnabled:NO];363 // [outIcecastMountTF setEnabled:NO]; 355 364 [projectName setEnabled:NO]; 356 365 [projectAuthor setEnabled:NO]; … … 408 417 [outIcecastIPTF setEnabled:YES]; 409 418 [outIcecastPortTF setEnabled:YES]; 410 [outIcecastMountTF setEnabled:YES];419 // [outIcecastMountTF setEnabled:YES]; 411 420 [projectName setEnabled:YES]; 412 421 [projectAuthor setEnabled:YES]; -
flex/inout-av/src/main.mxml
r90c2f4d r8c0c8a9 1 1 <?xml version="1.0" encoding="iso-8859-1"?> 2 2 <mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" 3 width=" 400" height="380" creationComplete="onAppInit()" >3 width="600" height="550" creationComplete="onAppInit()" > 4 4 5 <mx:HTTPService id="service" resultFormat="text" 6 url="http://wiki.citu.info/_export/tac/" 7 result="onTacLoad(event)" 8 fault="onTacFault(event)" 9 concurrency="single" 10 method="GET" /> 11 5 12 <mx:Script> 6 13 <![CDATA[ 7 14 import mx.controls.Alert; 15 import mx.rpc.events.ResultEvent; 16 import mx.rpc.events.FaultEvent; 8 17 9 18 private var conn:NetConnection; … … 27 36 password="f78b64c9e0f2ea24fddce2b0d809cb2855fed1a6"; 28 37 38 camsize.selectedIndex=1; 39 tabs.selectedIndex=1; 40 tabs.validateNow(); 41 tabs.selectedIndex=0; 42 tabs.validateNow(); 43 29 44 cam = Camera.getCamera(); 30 45 mic = Microphone.getMicrophone(); … … 32 47 bt.enabled=false; 33 48 tg.enabled=false; 49 ta.enabled=false; 50 tt.enabled=false; 51 td.enabled=false; 52 tu.enabled=false; 53 tp.enabled=false; 54 camsize.enabled=false; 34 55 Alert.show('You do need a camera for live streaming.\nPlease connect one and then reload this Page.', 35 56 'No camera detected', mx.controls.Alert.OK); … … 48 69 , 'Camera Info', mx.controls.Alert.OK); 49 70 */ 50 } 51 71 } 72 73 private function changeSize(event:Event):void { 74 if (event.currentTarget.selectedIndex == 0) 75 cam.setMode(160,120,25); 76 if (event.currentTarget.selectedIndex == 1) 77 cam.setMode(384,288,25); 78 if (event.currentTarget.selectedIndex == 2) 79 cam.setMode(400,300,25); 80 if (event.currentTarget.selectedIndex == 3) 81 cam.setMode(640,480,25); 82 if (event.currentTarget.selectedIndex == 4) 83 cam.setMode(768,576,25); 84 if (event.currentTarget.selectedIndex == 5) 85 cam.setMode(800,600,25); 86 87 Alert.show( 88 'Note that only few webcam models support all sizes.\n'+ 89 'Camera size is now:\n'+ 90 'width:'+cam.width+'\n'+ 91 'height:'+cam.height+'\n'+ 92 'fps:'+cam.fps+'\n' 93 , 'Camera Info', mx.controls.Alert.OK); 94 } 95 52 96 private function securityErrorHandler(event:SecurityErrorEvent):void { 53 97 ; … … 86 130 } 87 131 132 private function onTacFault(event:FaultEvent):void 133 { 134 Alert.show('HTTP error:\n'+event.toString(),'Alert.', mx.controls.Alert.OK); 135 bt.selected=false; 136 } 137 138 private function onTacLoad(event:ResultEvent):void 139 { 140 var rawData:String = String(event.result); 141 if (rawData=="") { 142 Alert.show('invalid project name or password.','Alert.', mx.controls.Alert.OK); 143 bt.selected=false; 144 return; 145 } 146 // Alert.show('wiki:\n'+rawData,'Debug.', mx.controls.Alert.OK); 147 var mp:RegExp = /[^a-zA-Z0-9,;]/g; 148 uploadName = baseName+"-("+rawData.replace(mp,"").replace(" ","_")+")"; 149 // Alert.show('uploadName: '+uploadName,'Debug.', mx.controls.Alert.OK); 150 launchConnection(); 151 } 152 88 153 private function startConnection():void 89 { 154 { 155 if (tabs.selectedIndex ==0 ) 156 { 90 157 /* 91 158 var now:Date = new Date(); … … 93 160 uploadName=now.valueOf().toString()+"-"+rnd.toString(); 94 161 */ 95 uploadName=baseName+"-("+tg.text.replace(" ","_")+")"; 162 uploadName = baseName+"-(" 163 +tg.text.replace(/, /g,",").replace(/ /g,"").replace(/ /g,"_")+';' 164 +tt.text.replace(/ /g,"_")+';' 165 +ta.text.replace(/ /g,"_")+';' 166 +td.text.replace(/ /g,"_") 167 +")"; 168 launchConnection(); 169 } else { 170 service.send({id:"projects/"+tu.text.replace(" ,","_"), password:tp.text}); 171 } 172 } 173 174 private function launchConnection():void 175 { 176 // Alert.show('uploadName: '+uploadName,'Debug.', mx.controls.Alert.OK); 96 177 conn = new NetConnection(); 97 178 conn.client = this; … … 121 202 if(bt.selected) { 122 203 tg.enabled=false; 204 tt.enabled=false; 205 ta.enabled=false; 206 td.enabled=false; 207 tu.enabled=false; 208 tp.enabled=false; 209 camsize.enabled=false; 123 210 startConnection(); 124 211 } else { 125 212 stopRecording(); 126 213 tg.enabled=true; 214 tt.enabled=true; 215 ta.enabled=true; 216 td.enabled=true; 217 tu.enabled=true; 218 camsize.enabled=true; 219 tp.enabled=false; 127 220 } 128 221 } 129 222 ]]> 130 223 </mx:Script> 131 132 <mx:VideoDisplay id="video" width="340" height="280" /> 133 <mx:Box direction="horizontal" > 134 <mx:Label text="Tags:" /> 135 <mx:TextInput id="tg" width="150" text="Live,Camera" restrict="a-zA-Z0-9, " maxChars="64"/> 136 <mx:Button id="bt" toggle="true" change="camBt(event)" label="Start Camera"/> 224 225 <mx:Box direction="horizontal" width="100%"> 226 <mx:Text> 227 <mx:htmlText> 228 <![CDATA[<font size="20px">TheArtCollider</font>]]> 229 </mx:htmlText> 230 </mx:Text> 231 <mx:Spacer width="100%"/> 232 <mx:Text width="207"> 233 <mx:htmlText> 234 <![CDATA[Step 1: Set Meta-Info <b>or</b> specify project ID]]> 235 </mx:htmlText> 236 </mx:Text> 237 </mx:Box> 238 239 <mx:TabNavigator id="tabs" borderStyle="solid" width="100%"> 240 <mx:VBox label="Enter meta-data by hand" 241 width="100%" 242 height="75"> 243 <mx:Box direction="horizontal" > 244 <mx:Label width="40" text="Title:" /> 245 <mx:TextInput id="tt" width="150" text="Title" restrict="a-zA-Z0-9, " maxChars="64"/> 246 <mx:Label width="50" text="Author:" /> 247 <mx:TextInput id="ta" width="150" text="me" restrict="a-zA-Z0-9, " maxChars="64"/> 248 </mx:Box> 249 <mx:Box direction="horizontal" > 250 <mx:Label width="40" text="Desc:" /> 251 <mx:TextInput id="td" width="150" text="My Web Camera" restrict="a-zA-Z0-9, " maxChars="64"/> 252 <mx:Label width="50" text="Tags:" /> 253 <mx:TextInput id="tg" width="150" text="Live, Camera" restrict="a-zA-Z0-9, " maxChars="64"/> 254 </mx:Box> 255 </mx:VBox> 256 <mx:VBox label="Get meta-data from wiki" 257 width="100%" 258 height="75"> 259 <mx:Box direction="horizontal" > 260 <mx:Label width="40" text="ID:" /> 261 <mx:TextInput id="tu" width="150" text="myProject" restrict="a-zA-Z0-9_ " maxChars="64"/> 262 <mx:Label width="70" text="Password:"/> 263 <mx:TextInput id="tp" width="150" text="" displayAsPassword="true" restrict="a-zA-Z0-9_ " enabled="true" maxChars="64"/> 264 265 </mx:Box> 266 <mx:Text width="100%"> 267 <mx:htmlText> 268 <![CDATA[The ID needs to match a project-name created in the <font color="#0000ff"><a href="http://wiki.citu.fr/signup">Wiki</a></font>.<br/>View a list of <font color="#0000ff"><a href="http://wiki.citu.info/projects">registered projects</a></font>.]]> 269 </mx:htmlText> 270 </mx:Text> 271 </mx:VBox> 272 </mx:TabNavigator> 273 274 <mx:Box direction="horizontal" width="100%"> 275 <mx:VideoDisplay id="video" width="340" height="280" /> 276 <mx:VBox width="200" height="280"> 277 <mx:Text width="180"> 278 <mx:htmlText> 279 <![CDATA[Step 2: Set up camera (right click -> settings)]]> 280 </mx:htmlText> 281 </mx:Text> 282 <mx:ComboBox id="camsize" change="changeSize(event)"> 283 <mx:ArrayCollection> 284 <mx:String>160x120</mx:String> 285 <mx:String>384x288</mx:String> 286 <mx:String>400x300</mx:String> 287 <mx:String>640x480</mx:String> 288 <mx:String>768x576</mx:String> 289 <mx:String>800x600</mx:String> 290 </mx:ArrayCollection> 291 </mx:ComboBox> 292 <mx:Spacer height="100%"/> 293 <mx:Label width="180" text="Step 3: Start camera stream" /> 294 <mx:Button id="bt" toggle="true" change="camBt(event)" label="Start Camera"/> 295 </mx:VBox> 137 296 </mx:Box> 138 297 -
misc/red5/myenc.sh
r1014872 r8c0c8a9 1 1 #!/bin/sh 2 3 export PATH=/sw/bin:/usr/local/bin:$PATH 4 2 5 ICEHOST=io.citu.info 3 6 ICEPORT=8000 … … 5 8 6 9 RAWNAME=$1 10 FILTERED=$(echo "${RAWNAME}" | gawk '/\([a-zA-Z0-9,_;]*\)/{print};' | sed 's/^.*-(\([^)]*\)).*$/\1/') 7 11 8 TAGS=$(echo "${RAWNAME}" | awk '/\([a-zA-Z0-9,_]*\)/{print};' | sed 's/^.*-(\([^)]*\)).*$/\1/' | sed 's/_/ /') 9 NAME=$(echo "${RAWNAME}" | sed 's/-([^)]*)//' | sed 's/.flv$//') 12 TAGS=$(echo "${FILTERED}" | cut -s -d ';' -f 1 | sed 's/_/ /g') 13 DESC=$(echo "${FILTERED}" | cut -s -d ';' -f 4 | sed 's/_/ /g') 14 NAME=$(echo "${FILTERED}" | cut -s -d ';' -f 2) 15 TITLE=$(echo "${FILTERED}" | cut -s -d ';' -f 2 | sed 's/_/ /g') 16 AUTHOR=$(echo "${FILTERED}" | cut -s -d ';' -f 3) 17 URL="" 10 18 11 DESC="InOut Camera" 12 test -z "$TAGS" && TAGS="Camera,Live" 19 test -z "${TAGS}" && TAGS="Camera,Live" 20 test -z "${DESC}" && DESC="InOut Camera" 21 test -z "${NAME}" && NAME=$(echo "${RAWNAME}" | sed 's/-([^)]*)//' | sed 's/.flv$//') 22 test -n "${AUTHOR}" && URL="http://wiki.citu.info/user/$AUTHOR" 23 test -z "${URL}" && URL="http://theartcollider.org" 13 24 14 MOUNT=$NAME.og v25 MOUNT=$NAME.ogg 15 26 16 27 THUSNELDAOPTS="--inputfps 10 -F 25 " … … 21 32 THUSNELDAOPTS="$THUSNELDAOPTS --noaudio" 22 33 23 #exec ffmpeg -i - -f mpegvideo -r 15 - 2>>/tmp/ffx.debug \24 # | ffmpeg2theora $THUSNELDAOPTS -o /dev/stdout - 2>>/tmp/ff2t.debug \25 # | oggfwd -p -g "$GENRE" -d "$DESC" -n "$NAME" $ICEHOST $ICEPORT $ICEPASS $MOUNT \26 # >> /tmp/ogg.debug27 28 #exec ffmpeg2theora $THUSNELDAOPTS -o - - 2>>/tmp/ff2t.debug \29 # | oggfwd -p -g "$GENRE" -d "$DESC" -n "$NAME" $ICEHOST $ICEPORT $ICEPASS $MOUNT \30 # >> /tmp/ogg.debug31 32 34 exec ffmpeg2theora $THUSNELDAOPTS -o - - 2>>/tmp/ff2t.debug \ 33 | piperespawn oggfwd -p -g "$ GENRE" -d "$DESC" -n "$NAME" $ICEHOST $ICEPORT $ICEPASS $MOUNT \35 | piperespawn oggfwd -p -g "$TAGS" -d "$DESC" -n "$NAME" -u "$URL" $ICEHOST $ICEPORT $ICEPASS $MOUNT \ 34 36 >> /tmp/ogg.debug -
qio/inout.pro
r1a9e8cb r8c0c8a9 2 2 TARGET = 3 3 DEPENDPATH += . 4 INCLUDEPATH += . 4 INCLUDEPATH += . icecast /usr/include/libxml2/ 5 DEFINES += HAVE_CONFIG_H 5 6 6 HEADERS += inout.h 7 linux:LIBS += -lssl -lcrypto -lcurl -lspeex -ltheora -logg -lvorbis -lxslt -lxml2 8 9 10 #linux:INCLUDEPATH += /usr/include/libxml2/ 11 #win32-x-g++:INCLUDEPATH += /home/rgareus/.wine/drive_c/cygwin/usr/include 12 13 LIBS += -lssl -lcrypto -lcurl -logg -lxml2 -L/home/rgareus/.wine/drive_c/cygwin/lib -lcygwin 14 #win32-x-g++:LIBPATH+=/home/rgareus/.wine/drive_c/cygwin/lib 15 #win32-x-g++:LIBS += -static 16 7 17 FORMS += qinout.ui 8 SOURCES += inout.cpp main.cpp 18 19 HEADERS += inout.h \ 20 \ 21 config.h \ 22 \ 23 icecast/avl/avl.h \ 24 icecast/httpp/httpp.h \ 25 icecast/log/log.h \ 26 icecast/net/resolver.h icecast/net/sock.h \ 27 icecast/thread/thread.h \ 28 icecast/timing/timing.h \ 29 \ 30 icecast/admin.h icecast/cfgfile.h icecast/logging.h icecast/sighandler.h icecast/connection.h \ 31 icecast/global.h icecast/util.h icecast/slave.h icecast/source.h icecast/stats.h icecast/refbuf.h icecast/client.h \ 32 icecast/compat.h icecast/fserve.h icecast/xslt.h icecast/yp.h icecast/event.h icecast/md5.h \ 33 icecast/auth.h icecast/auth_htpasswd.h icecast/auth_url.h \ 34 icecast/format.h icecast/format_ogg.h icecast/format_mp3.h \ 35 icecast/format_vorbis.h icecast/format_theora.h icecast/format_flac.h icecast/format_speex.h icecast/format_midi.h \ 36 icecast/format_kate.h icecast/format_skeleton.h \ 37 38 SOURCES += inout.cpp main.cpp \ 39 \ 40 icecast/avl/avl.c \ 41 icecast/httpp/httpp.c \ 42 icecast/log/log.c \ 43 icecast/net/resolver.c icecast/net/sock.c \ 44 icecast/thread/thread.c \ 45 icecast/timing/timing.c \ 46 \ 47 icecast/cfgfile.c icecast/logging.c icecast/sighandler.c icecast/connection.c icecast/global.c \ 48 icecast/util.c icecast/slave.c icecast/source.c icecast/stats.c icecast/refbuf.c icecast/client.c \ 49 icecast/xslt.c icecast/fserve.c icecast/event.c icecast/admin.c icecast/md5.c \ 50 icecast/format.c icecast/format_ogg.c icecast/format_mp3.c icecast/format_midi.c icecast/format_flac.c \ 51 icecast/auth.c icecast/auth_htpasswd.c icecast/format_kate.c icecast/format_skeleton.c \ 52 icecast/yp.c icecast/auth_url.c icecast/format_vorbis.c icecast/format_theora.c icecast/format_speex.c \ 53 \ 54 9 55 10 56 QT += xml network