Changeset 0ee141885f32148ecc02656a770881b230d197b9
- Timestamp:
- 21/12/07 18:22:39
(10 months ago)
- Author:
- Rémi Denis-Courmont <rem@videolan.org>
- git-committer:
- Rémi Denis-Courmont <rem@videolan.org> 1198257759 +0000
- git-parent:
[f3f2b96271ce1acf0c0e5557776251b83838c773]
- git-author:
- Rémi Denis-Courmont <rem@videolan.org> 1198257759 +0000
- Message:
Add module_Exists until I don't get any error on my build tree!
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r03421f3 |
r0ee1418 |
|
| 348 | 348 | |
|---|
| 349 | 349 | #define TestCaC( name ) \ |
|---|
| 350 | | b_cache_equal = b_cache_equal && ( i_cache == config_GetInt( p_intf, name ) ); |
|---|
| | 350 | b_cache_equal = b_cache_equal && \ |
|---|
| | 351 | ( i_cache == config_GetInt( p_intf, name ) ) |
|---|
| 351 | 352 | |
|---|
| 352 | 353 | #define TestCaCi( name, int ) \ |
|---|
| 353 | 354 | b_cache_equal = b_cache_equal && \ |
|---|
| 354 | | ( ( i_cache * int ) == config_GetInt( p_intf, name ) ); |
|---|
| | 355 | ( ( i_cache * int ) == config_GetInt( p_intf, name ) ) |
|---|
| 355 | 356 | /* Select the accurate value of the ComboBox */ |
|---|
| 356 | 357 | bool b_cache_equal = true; |
|---|
| 357 | 358 | int i_cache = config_GetInt( p_intf, "file-caching"); |
|---|
| 358 | 359 | |
|---|
| 359 | | TestCaC( "udp-caching" ) TestCaC( "dvdread-caching" ) |
|---|
| 360 | | TestCaC( "dvdnav-caching" ) TestCaC( "tcp-caching" ) |
|---|
| 361 | | TestCaC( "fake-caching" ) TestCaC( "cdda-caching" ) |
|---|
| 362 | | TestCaC( "screen-caching" ) TestCaC( "vcd-caching" ) |
|---|
| | 360 | TestCaC( "udp-caching" ); |
|---|
| | 361 | if (module_Exists (p_intf, "dvdread")) |
|---|
| | 362 | TestCaC( "dvdread-caching" ); |
|---|
| | 363 | if (module_Exists (p_intf, "dvdnav")) |
|---|
| | 364 | TestCaC( "dvdnav-caching" ); |
|---|
| | 365 | TestCaC( "tcp-caching" ); |
|---|
| | 366 | TestCaC( "fake-caching" ); TestCaC( "cdda-caching" ); |
|---|
| | 367 | TestCaC( "screen-caching" ); TestCaC( "vcd-caching" ); |
|---|
| 363 | 368 | #ifdef WIN32 |
|---|
| 364 | | TestCaC( "dshow-caching" ) |
|---|
| | 369 | TestCaC( "dshow-caching" ); |
|---|
| 365 | 370 | #else |
|---|
| 366 | | TestCaC( "v4l-caching" ) TestCaC( "jack-input-caching" ) |
|---|
| 367 | | TestCaC( "v4l2-caching" ) TestCaC( "pvr-caching" ) |
|---|
| | 371 | if (module_Exists (p_intf, "v4l")) |
|---|
| | 372 | TestCaC( "v4l-caching" ); |
|---|
| | 373 | if (module_Exists (p_intf, "access_jack")) |
|---|
| | 374 | TestCaC( "jack-input-caching" ); |
|---|
| | 375 | if (module_Exists (p_intf, "v4l2")) |
|---|
| | 376 | TestCaC( "v4l2-caching" ); |
|---|
| | 377 | if (module_Exists (p_intf, "pvr")) |
|---|
| | 378 | TestCaC( "pvr-caching" ); |
|---|
| 368 | 379 | #endif |
|---|
| 369 | | TestCaCi( "rtsp-caching", 4 ) TestCaCi( "ftp-caching", 2 ) |
|---|
| 370 | | TestCaCi( "http-caching", 4 ) TestCaCi( "realrtsp-caching", 10 ) |
|---|
| 371 | | TestCaCi( "mms-caching", 19 ) |
|---|
| | 380 | TestCaCi( "rtsp-caching", 4 ); TestCaCi( "ftp-caching", 2 ); |
|---|
| | 381 | TestCaCi( "http-caching", 4 ); |
|---|
| | 382 | if (module_Exists (p_intf, "access_realrtsp")) |
|---|
| | 383 | TestCaCi( "realrtsp-caching", 10 ); |
|---|
| | 384 | TestCaCi( "mms-caching", 19 ); |
|---|
| 372 | 385 | if( b_cache_equal ) ui.cachingCombo->setCurrentIndex( |
|---|
| 373 | 386 | ui.cachingCombo->findData( QVariant( i_cache ) ) ); |
|---|
| … | … | |
| 517 | 530 | config_PutPsz( p_intf, "access-filter", qtu( qs_filter ) ); |
|---|
| 518 | 531 | |
|---|
| 519 | | #define CaCi( name, int ) config_PutInt( p_intf, name, int * i_comboValue ); |
|---|
| 520 | | #define CaC( name ) CaCi( name, 1 ); |
|---|
| | 532 | #define CaCi( name, int ) config_PutInt( p_intf, name, int * i_comboValue ) |
|---|
| | 533 | #define CaC( name ) CaCi( name, 1 ) |
|---|
| 521 | 534 | /* Caching */ |
|---|
| 522 | 535 | QComboBox *cachingCombo = qobject_cast<QComboBox *>(optionWidgets[cachingCoB]); |
|---|
| … | … | |
| 525 | 538 | { |
|---|
| 526 | 539 | msg_Dbg( p_intf, "Adjusting all cache values at: %i", i_comboValue ); |
|---|
| 527 | | CaC( "udp-caching" ); CaC( "dvdread-caching" ); |
|---|
| 528 | | CaC( "dvdnav-caching" ); CaC( "tcp-caching" ); CaC( "vcd-caching" ); |
|---|
| | 540 | CaC( "udp-caching" ); |
|---|
| | 541 | if (module_Exists (p_intf, "dvdread")) |
|---|
| | 542 | CaC( "dvdread-caching" ); |
|---|
| | 543 | if (module_Exists (p_intf, "dvdnav")) |
|---|
| | 544 | CaC( "dvdnav-caching" ); |
|---|
| | 545 | CaC( "tcp-caching" ); CaC( "vcd-caching" ); |
|---|
| 529 | 546 | CaC( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" ); |
|---|
| 530 | 547 | CaC( "screen-caching" ); |
|---|
| 531 | 548 | CaCi( "rtsp-caching", 4 ); CaCi( "ftp-caching", 2 ); |
|---|
| 532 | | CaCi( "http-caching", 4 ); CaCi( "realrtsp-caching", 10 ); |
|---|
| | 549 | CaCi( "http-caching", 4 ); |
|---|
| | 550 | if (module_Exists (p_intf, "access_realrtsp")) |
|---|
| | 551 | CaCi( "realrtsp-caching", 10 ); |
|---|
| 533 | 552 | CaCi( "mms-caching", 19 ); |
|---|
| 534 | 553 | #ifdef WIN32 |
|---|
| 535 | 554 | CaC( "dshow-caching" ); |
|---|
| 536 | 555 | #else |
|---|
| 537 | | CaC( "v4l-caching" ); CaC( "jack-input-caching" ); |
|---|
| 538 | | CaC( "v4l2-caching" ); CaC( "pvr-caching" ); |
|---|
| | 556 | if (module_Exists (p_intf, "v4l")) |
|---|
| | 557 | CaC( "v4l-caching" ); |
|---|
| | 558 | if (module_Exists (p_intf, "access_jack")) |
|---|
| | 559 | CaC( "jack-input-caching" ); |
|---|
| | 560 | if (module_Exists (p_intf, "v4l2")) |
|---|
| | 561 | CaC( "v4l2-caching" ); |
|---|
| | 562 | if (module_Exists (p_intf, "pvr")) |
|---|
| | 563 | CaC( "pvr-caching" ); |
|---|
| 539 | 564 | #endif |
|---|
| 540 | 565 | //CaCi( "dv-caching" ) too short... |
|---|