Files
@ r26913:e7b3d514fe34
Branch filter:
Location: cpp/openttd-patchpack/source/src/music_gui.cpp - annotation
r26913:e7b3d514fe34
31.0 KiB
text/x-c
Revert 92c7551: Line drawing algorithm fix broke other cases (#10497)
This reverts commit 92c755161d6a467d33477bd0041fc720d7d9ba41.
This reverts commit 92c755161d6a467d33477bd0041fc720d7d9ba41.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 | r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r6201:2e76eb9a1d7a r5584:545d748cc681 r22926:82779a967ee2 r5584:545d748cc681 r14055:e4168a875df8 r7170:38b143754b40 r8106:01dbd10fde05 r8114:866ed489ed98 r8131:7a50db7be0ff r8157:cf41aa22cd09 r8224:194097dc7288 r22840:3800971f1447 r8433:ed199dffe99f r18617:524f2e0f54dc r14248:a9050881acd7 r14248:a9050881acd7 r17438:d5ae9e98ac04 r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r25139:87bde218e763 r26536:a1a59110a08b r5584:545d748cc681 r18670:f122c356353c r18670:f122c356353c r8264:d493cb51fe8a r8264:d493cb51fe8a r8264:d493cb51fe8a r21383:942c32fb8b0e r21383:942c32fb8b0e r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r14055:e4168a875df8 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r14050:b7e0ee8ee2b9 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r24217:df2f5854f1e3 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r14055:e4168a875df8 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r14055:e4168a875df8 r14055:e4168a875df8 r18195:060426ee5618 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r26381:4f81dd601633 r22926:82779a967ee2 r22926:82779a967ee2 r14055:e4168a875df8 r26381:4f81dd601633 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r14055:e4168a875df8 r14055:e4168a875df8 r14055:e4168a875df8 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r24217:df2f5854f1e3 r22926:82779a967ee2 r22926:82779a967ee2 r24217:df2f5854f1e3 r23057:0c9ab2c5719b r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r5584:545d748cc681 r5584:545d748cc681 r5584:545d748cc681 r22837:96ab6aaff487 r22837:96ab6aaff487 r22837:96ab6aaff487 r22837:96ab6aaff487 r6247:96e840dbefcc r5584:545d748cc681 r22926:82779a967ee2 r12879:96ac3c3969be r12879:96ac3c3969be r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r24217:df2f5854f1e3 r22926:82779a967ee2 r22841:0453c16d3b23 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22841:0453c16d3b23 r22841:0453c16d3b23 r9284:77d3847df580 r20280:ca1fc41725ff r12879:96ac3c3969be r20280:ca1fc41725ff r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r12879:96ac3c3969be r12879:96ac3c3969be r23499:f9bf6ad58697 r12879:96ac3c3969be r12879:96ac3c3969be r18686:dfaaba643efc r17438:d5ae9e98ac04 r12879:96ac3c3969be r22841:0453c16d3b23 r25394:5a394214a73a r22841:0453c16d3b23 r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r17476:d3b7a183536d r17476:d3b7a183536d r17476:d3b7a183536d r17476:d3b7a183536d r17476:d3b7a183536d r23499:f9bf6ad58697 r12879:96ac3c3969be r17476:d3b7a183536d r12879:96ac3c3969be r18686:dfaaba643efc r12879:96ac3c3969be r18686:dfaaba643efc r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r23499:f9bf6ad58697 r9284:77d3847df580 r12879:96ac3c3969be r18686:dfaaba643efc r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r15608:7b580ec7448a r15608:7b580ec7448a r12879:96ac3c3969be r18686:dfaaba643efc r12879:96ac3c3969be r12879:96ac3c3969be r22926:82779a967ee2 r22926:82779a967ee2 r13648:75f0ec9d5969 r22926:82779a967ee2 r13648:75f0ec9d5969 r24597:afde5721a3b6 r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r15608:7b580ec7448a r15608:7b580ec7448a r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r23499:f9bf6ad58697 r12879:96ac3c3969be r12879:96ac3c3969be r18686:dfaaba643efc r26575:d5725bf82346 r12879:96ac3c3969be r26575:d5725bf82346 r22926:82779a967ee2 r22926:82779a967ee2 r13648:75f0ec9d5969 r22926:82779a967ee2 r26549:82dacf005b0a r26549:82dacf005b0a r12879:96ac3c3969be r15608:7b580ec7448a r15608:7b580ec7448a r12879:96ac3c3969be r18686:dfaaba643efc r26575:d5725bf82346 r12879:96ac3c3969be r26575:d5725bf82346 r22929:b5f1201fb26c r22926:82779a967ee2 r13648:75f0ec9d5969 r22926:82779a967ee2 r26549:82dacf005b0a r26549:82dacf005b0a r12879:96ac3c3969be r15608:7b580ec7448a r15608:7b580ec7448a r12879:96ac3c3969be r9284:77d3847df580 r9284:77d3847df580 r23499:f9bf6ad58697 r9284:77d3847df580 r9284:77d3847df580 r18686:dfaaba643efc r15551:b196633d2a08 r22926:82779a967ee2 r15608:7b580ec7448a r15608:7b580ec7448a r5584:545d748cc681 r18686:dfaaba643efc r15551:b196633d2a08 r22926:82779a967ee2 r15608:7b580ec7448a r15608:7b580ec7448a r5584:545d748cc681 r22841:0453c16d3b23 r22841:0453c16d3b23 r23601:0de2754ecd7e r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r18686:dfaaba643efc r22926:82779a967ee2 r9284:77d3847df580 r5584:545d748cc681 r18686:dfaaba643efc r18686:dfaaba643efc r22926:82779a967ee2 r9284:77d3847df580 r5584:545d748cc681 r5584:545d748cc681 r22841:0453c16d3b23 r23499:f9bf6ad58697 r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r22841:0453c16d3b23 r9284:77d3847df580 r5584:545d748cc681 r11628:3696f71b5a6c r11628:3696f71b5a6c r13742:180ad925befc r22841:0453c16d3b23 r22841:0453c16d3b23 r11628:3696f71b5a6c r13745:49505a0400d8 r11628:3696f71b5a6c r11628:3696f71b5a6c r11628:3696f71b5a6c r13745:49505a0400d8 r18686:dfaaba643efc r11628:3696f71b5a6c r11628:3696f71b5a6c r11628:3696f71b5a6c r11628:3696f71b5a6c r12879:96ac3c3969be r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r11628:3696f71b5a6c r18686:dfaaba643efc r13694:4523784084b5 r11628:3696f71b5a6c r11628:3696f71b5a6c r11628:3696f71b5a6c r18686:dfaaba643efc r18686:dfaaba643efc r11628:3696f71b5a6c r11628:3696f71b5a6c r11628:3696f71b5a6c r11628:3696f71b5a6c r11628:3696f71b5a6c r11628:3696f71b5a6c r20280:ca1fc41725ff r20283:2a199c78224c r5893:6c4fd9987e0f r19745:d8f95208ad9e r13554:d1964ead02ee r11368:058349c3a02c r5584:545d748cc681 r6247:96e840dbefcc r5584:545d748cc681 r9284:77d3847df580 r5584:545d748cc681 r5584:545d748cc681 r9284:77d3847df580 r20280:ca1fc41725ff r12829:467d0c995859 r20280:ca1fc41725ff r18686:dfaaba643efc r18686:dfaaba643efc r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r12829:467d0c995859 r12829:467d0c995859 r23499:f9bf6ad58697 r12851:84522c402bb3 r12851:84522c402bb3 r18686:dfaaba643efc r18686:dfaaba643efc r12851:84522c402bb3 r18686:dfaaba643efc r12851:84522c402bb3 r12851:84522c402bb3 r12851:84522c402bb3 r12851:84522c402bb3 r15608:7b580ec7448a r15608:7b580ec7448a r12858:be0a41a1f4b6 r18686:dfaaba643efc r12858:be0a41a1f4b6 r26563:75f924e74612 r26563:75f924e74612 r12858:be0a41a1f4b6 r15608:7b580ec7448a r15608:7b580ec7448a r12858:be0a41a1f4b6 r18686:dfaaba643efc r12858:be0a41a1f4b6 r22926:82779a967ee2 r22926:82779a967ee2 r12858:be0a41a1f4b6 r12858:be0a41a1f4b6 r26563:75f924e74612 r26563:75f924e74612 r12858:be0a41a1f4b6 r15608:7b580ec7448a r15608:7b580ec7448a r13657:5c5f57401fed r13657:5c5f57401fed r13657:5c5f57401fed r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r12851:84522c402bb3 r12851:84522c402bb3 r12851:84522c402bb3 r23499:f9bf6ad58697 r9284:77d3847df580 r12829:467d0c995859 r18686:dfaaba643efc r26575:d5725bf82346 r22839:791dbe85bb9c r22839:791dbe85bb9c r22839:791dbe85bb9c r12829:467d0c995859 r22926:82779a967ee2 r22926:82779a967ee2 r13732:bcfe5f5a2ff2 r13648:75f0ec9d5969 r12829:467d0c995859 r26575:d5725bf82346 r15608:7b580ec7448a r15608:7b580ec7448a r12858:be0a41a1f4b6 r18686:dfaaba643efc r26575:d5725bf82346 r12858:be0a41a1f4b6 r24046:6505c9992aeb r22839:791dbe85bb9c r22839:791dbe85bb9c r22926:82779a967ee2 r12829:467d0c995859 r24046:6505c9992aeb r12829:467d0c995859 r26575:d5725bf82346 r15608:7b580ec7448a r15608:7b580ec7448a r12831:ca6be2d6185b r25139:87bde218e763 r26573:6582b7725071 r15608:7b580ec7448a r25139:87bde218e763 r25139:87bde218e763 r26573:6582b7725071 r25139:87bde218e763 r12829:467d0c995859 r9284:77d3847df580 r9284:77d3847df580 r17476:d3b7a183536d r17476:d3b7a183536d r17476:d3b7a183536d r17476:d3b7a183536d r17476:d3b7a183536d r23499:f9bf6ad58697 r12879:96ac3c3969be r17476:d3b7a183536d r12879:96ac3c3969be r18686:dfaaba643efc r12879:96ac3c3969be r22838:79957438e365 r22838:79957438e365 r22838:79957438e365 r12879:96ac3c3969be r12879:96ac3c3969be r12879:96ac3c3969be r23499:f9bf6ad58697 r9284:77d3847df580 r9284:77d3847df580 r18686:dfaaba643efc r22926:82779a967ee2 r9284:77d3847df580 r9284:77d3847df580 r18686:dfaaba643efc r22926:82779a967ee2 r9284:77d3847df580 r9284:77d3847df580 r18686:dfaaba643efc r22926:82779a967ee2 r9284:77d3847df580 r9284:77d3847df580 r18686:dfaaba643efc r22926:82779a967ee2 r9284:77d3847df580 r9284:77d3847df580 r18686:dfaaba643efc r25139:87bde218e763 r26570:e093668ba4f1 r26536:a1a59110a08b r26536:a1a59110a08b r26536:a1a59110a08b r26536:a1a59110a08b r26536:a1a59110a08b r25401:01e14e339ac5 r25140:9db7328e9b6d r9284:77d3847df580 r9284:77d3847df580 r23338:1911a7491dbc r15608:7b580ec7448a r15608:7b580ec7448a r9284:77d3847df580 r18686:dfaaba643efc r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r22926:82779a967ee2 r18686:dfaaba643efc r9284:77d3847df580 r9284:77d3847df580 r18686:dfaaba643efc r9284:77d3847df580 r9284:77d3847df580 r9284:77d3847df580 r18686:dfaaba643efc r18686:dfaaba643efc r22926:82779a967ee2 r9284:77d3847df580 r9284:77d3847df580 r9284:77d3847df580 r9284:77d3847df580 r5584:545d748cc681 r11628:3696f71b5a6c r11628:3696f71b5a6c r13742:180ad925befc r13742:180ad925befc r20733:6e2cb2f08407 r20733:6e2cb2f08407 r11628:3696f71b5a6c r11628:3696f71b5a6c r11628:3696f71b5a6c r13732:bcfe5f5a2ff2 r13732:bcfe5f5a2ff2 r13732:bcfe5f5a2ff2 r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r13732:bcfe5f5a2ff2 r13732:bcfe5f5a2ff2 r13732:bcfe5f5a2ff2 r18686:dfaaba643efc r24037:9b78c030d159 r13732:bcfe5f5a2ff2 r13732:bcfe5f5a2ff2 r24037:9b78c030d159 r13732:bcfe5f5a2ff2 r13732:bcfe5f5a2ff2 r13732:bcfe5f5a2ff2 r24037:9b78c030d159 r13732:bcfe5f5a2ff2 r12830:37daf0a59066 r11628:3696f71b5a6c r11628:3696f71b5a6c r18686:dfaaba643efc r12851:84522c402bb3 r13732:bcfe5f5a2ff2 r13732:bcfe5f5a2ff2 r18686:dfaaba643efc r13732:bcfe5f5a2ff2 r13732:bcfe5f5a2ff2 r12858:be0a41a1f4b6 r18686:dfaaba643efc r18686:dfaaba643efc r12858:be0a41a1f4b6 r12858:be0a41a1f4b6 r18686:dfaaba643efc r18686:dfaaba643efc r11628:3696f71b5a6c r13732:bcfe5f5a2ff2 r13732:bcfe5f5a2ff2 r18686:dfaaba643efc r13732:bcfe5f5a2ff2 r13732:bcfe5f5a2ff2 r11628:3696f71b5a6c r11628:3696f71b5a6c r12830:37daf0a59066 r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r18686:dfaaba643efc r11628:3696f71b5a6c r11628:3696f71b5a6c r11628:3696f71b5a6c r20280:ca1fc41725ff r20283:2a199c78224c r5893:6c4fd9987e0f r19745:d8f95208ad9e r13554:d1964ead02ee r11368:058349c3a02c r5584:545d748cc681 r6247:96e840dbefcc r5584:545d748cc681 r9284:77d3847df580 r5584:545d748cc681 | /*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file music_gui.cpp GUI for the music playback. */
#include "stdafx.h"
#include <vector>
#include "openttd.h"
#include "base_media_base.h"
#include "music/music_driver.hpp"
#include "window_gui.h"
#include "strings_func.h"
#include "window_func.h"
#include "sound_func.h"
#include "gfx_func.h"
#include "zoom_func.h"
#include "core/random_func.hpp"
#include "error.h"
#include "core/geometry_func.hpp"
#include "string_func.h"
#include "settings_type.h"
#include "settings_gui.h"
#include "widgets/dropdown_func.h"
#include "widgets/dropdown_type.h"
#include "widgets/slider_func.h"
#include "mixer.h"
#include "widgets/music_widget.h"
#include "table/strings.h"
#include "table/sprites.h"
#include "safeguards.h"
struct MusicSystem {
struct PlaylistEntry : MusicSongInfo {
const MusicSet *set; ///< music set the song comes from
uint set_index; ///< index of song in set
PlaylistEntry(const MusicSet *set, uint set_index) : MusicSongInfo(set->songinfo[set_index]), set(set), set_index(set_index) { }
bool IsValid() const { return !StrEmpty(this->songname); }
};
typedef std::vector<PlaylistEntry> Playlist;
enum PlaylistChoices {
PLCH_ALLMUSIC,
PLCH_OLDSTYLE,
PLCH_NEWSTYLE,
PLCH_EZYSTREET,
PLCH_CUSTOM1,
PLCH_CUSTOM2,
PLCH_THEMEONLY,
PLCH_MAX,
};
Playlist active_playlist; ///< current play order of songs, including any shuffle
Playlist displayed_playlist; ///< current playlist as displayed in GUI, never in shuffled order
Playlist music_set; ///< all songs in current music set, in set order
PlaylistChoices selected_playlist;
void BuildPlaylists();
void ChangePlaylist(PlaylistChoices pl);
void ChangeMusicSet(const std::string &set_name);
void Shuffle();
void Unshuffle();
void Play();
void Stop();
void Next();
void Prev();
void CheckStatus();
bool IsPlaying() const;
bool IsShuffle() const;
PlaylistEntry GetCurrentSong() const;
bool IsCustomPlaylist() const;
void PlaylistAdd(size_t song_index);
void PlaylistRemove(size_t song_index);
void PlaylistClear();
private:
void ChangePlaylistPosition(int ofs);
int playlist_position;
void SaveCustomPlaylist(PlaylistChoices pl);
Playlist standard_playlists[PLCH_MAX];
};
MusicSystem _music;
/** Rebuild all playlists for the current music set */
void MusicSystem::BuildPlaylists()
{
const MusicSet *set = BaseMusic::GetUsedSet();
/* Clear current playlists */
for (size_t i = 0; i < lengthof(this->standard_playlists); ++i) this->standard_playlists[i].clear();
this->music_set.clear();
/* Build standard playlists, and a list of available music */
for (uint i = 0; i < NUM_SONGS_AVAILABLE; i++) {
PlaylistEntry entry(set, i);
if (!entry.IsValid()) continue;
this->music_set.push_back(entry);
/* Add theme song to theme-only playlist */
if (i == 0) this->standard_playlists[PLCH_THEMEONLY].push_back(entry);
/* Don't add the theme song to standard playlists */
if (i > 0) {
this->standard_playlists[PLCH_ALLMUSIC].push_back(entry);
uint theme = (i - 1) / NUM_SONGS_CLASS;
this->standard_playlists[PLCH_OLDSTYLE + theme].push_back(entry);
}
}
/* Load custom playlists
* Song index offsets are 1-based, zero indicates invalid/end-of-list value */
for (uint i = 0; i < NUM_SONGS_PLAYLIST; i++) {
if (_settings_client.music.custom_1[i] > 0 && _settings_client.music.custom_1[i] <= NUM_SONGS_AVAILABLE) {
PlaylistEntry entry(set, _settings_client.music.custom_1[i] - 1);
if (entry.IsValid()) this->standard_playlists[PLCH_CUSTOM1].push_back(entry);
}
if (_settings_client.music.custom_2[i] > 0 && _settings_client.music.custom_2[i] <= NUM_SONGS_AVAILABLE) {
PlaylistEntry entry(set, _settings_client.music.custom_2[i] - 1);
if (entry.IsValid()) this->standard_playlists[PLCH_CUSTOM2].push_back(entry);
}
}
}
/**
* Switch to another playlist, or reload the current one.
* @param pl Playlist to select
*/
void MusicSystem::ChangePlaylist(PlaylistChoices pl)
{
assert(pl < PLCH_MAX && pl >= PLCH_ALLMUSIC);
this->displayed_playlist = this->standard_playlists[pl];
this->active_playlist = this->displayed_playlist;
this->selected_playlist = pl;
this->playlist_position = 0;
if (this->selected_playlist != PLCH_THEMEONLY) _settings_client.music.playlist = this->selected_playlist;
if (_settings_client.music.shuffle) {
this->Shuffle();
/* Shuffle() will also Play() if necessary, only start once */
} else if (_settings_client.music.playing) {
this->Play();
}
InvalidateWindowData(WC_MUSIC_TRACK_SELECTION, 0);
InvalidateWindowData(WC_MUSIC_WINDOW, 0);
}
/**
* Change to named music set, and reset playback.
* @param set_name Name of music set to select
*/
void MusicSystem::ChangeMusicSet(const std::string &set_name)
{
BaseMusic::SetSet(set_name);
BaseMusic::ini_set = set_name;
this->BuildPlaylists();
this->ChangePlaylist(this->selected_playlist);
InvalidateWindowData(WC_GAME_OPTIONS, WN_GAME_OPTIONS_GAME_OPTIONS, 0, true);
}
/** Enable shuffle mode and restart playback */
void MusicSystem::Shuffle()
{
_settings_client.music.shuffle = true;
this->active_playlist = this->displayed_playlist;
for (size_t i = 0; i < this->active_playlist.size(); i++) {
size_t shuffle_index = InteractiveRandom() % (this->active_playlist.size() - i);
std::swap(this->active_playlist[i], this->active_playlist[i + shuffle_index]);
}
if (_settings_client.music.playing) this->Play();
InvalidateWindowData(WC_MUSIC_WINDOW, 0);
}
/** Disable shuffle and restart playback */
void MusicSystem::Unshuffle()
{
_settings_client.music.shuffle = false;
this->active_playlist = this->displayed_playlist;
if (_settings_client.music.playing) this->Play();
InvalidateWindowData(WC_MUSIC_WINDOW, 0);
}
/** Start/restart playback at current song */
void MusicSystem::Play()
{
/* Always set the playing flag, even if there is no music */
_settings_client.music.playing = true;
MusicDriver::GetInstance()->StopSong();
/* Make sure playlist_position is a valid index, if playlist has changed etc. */
this->ChangePlaylistPosition(0);
/* If there is no music, don't try to play it */
if (this->active_playlist.empty()) return;
MusicSongInfo song = this->active_playlist[this->playlist_position];
if (_game_mode == GM_MENU && this->selected_playlist == PLCH_THEMEONLY) song.loop = true;
MusicDriver::GetInstance()->PlaySong(song);
InvalidateWindowData(WC_MUSIC_WINDOW, 0);
}
/** Stop playback and set flag that we don't intend to play music */
void MusicSystem::Stop()
{
MusicDriver::GetInstance()->StopSong();
_settings_client.music.playing = false;
InvalidateWindowData(WC_MUSIC_WINDOW, 0);
}
/** Skip to next track */
void MusicSystem::Next()
{
this->ChangePlaylistPosition(+1);
if (_settings_client.music.playing) this->Play();
InvalidateWindowData(WC_MUSIC_WINDOW, 0);
}
/** Skip to previous track */
void MusicSystem::Prev()
{
this->ChangePlaylistPosition(-1);
if (_settings_client.music.playing) this->Play();
InvalidateWindowData(WC_MUSIC_WINDOW, 0);
}
/** Check that music is playing if it should, and that appropriate playlist is active for game/main menu */
void MusicSystem::CheckStatus()
{
if ((_game_mode == GM_MENU) != (this->selected_playlist == PLCH_THEMEONLY)) {
/* Make sure the theme-only playlist is active when on the title screen, and not during gameplay */
this->ChangePlaylist((_game_mode == GM_MENU) ? PLCH_THEMEONLY : (PlaylistChoices)_settings_client.music.playlist);
}
if (this->active_playlist.empty()) return;
/* If we were supposed to be playing, but music has stopped, move to next song */
if (this->IsPlaying() && !MusicDriver::GetInstance()->IsSongPlaying()) this->Next();
}
/** Is the player getting music right now? */
bool MusicSystem::IsPlaying() const
{
return _settings_client.music.playing && !this->active_playlist.empty();
}
/** Is shuffle mode enabled? */
bool MusicSystem::IsShuffle() const
{
return _settings_client.music.shuffle;
}
/** Return the current song, or a dummy if none */
MusicSystem::PlaylistEntry MusicSystem::GetCurrentSong() const
{
if (!this->IsPlaying()) return PlaylistEntry(BaseMusic::GetUsedSet(), 0);
return this->active_playlist[this->playlist_position];
}
/** Is one of the custom playlists selected? */
bool MusicSystem::IsCustomPlaylist() const
{
return (this->selected_playlist == PLCH_CUSTOM1) || (this->selected_playlist == PLCH_CUSTOM2);
}
/**
* Append a song to a custom playlist.
* Always adds to the currently active playlist.
* @param song_index Index of song in the current music set to add
*/
void MusicSystem::PlaylistAdd(size_t song_index)
{
if (!this->IsCustomPlaylist()) return;
/* Pick out song from the music set */
if (song_index >= this->music_set.size()) return;
PlaylistEntry entry = this->music_set[song_index];
/* Check for maximum length */
if (this->standard_playlists[this->selected_playlist].size() >= NUM_SONGS_PLAYLIST) return;
/* Add it to the appropriate playlist, and the display */
this->standard_playlists[this->selected_playlist].push_back(entry);
this->displayed_playlist.push_back(entry);
/* Add it to the active playlist, if playback is shuffled select a random position to add at */
if (this->active_playlist.empty()) {
this->active_playlist.push_back(entry);
if (this->IsPlaying()) this->Play();
} else if (this->IsShuffle()) {
/* Generate a random position between 0 and n (inclusive, new length) to insert at */
size_t maxpos = this->displayed_playlist.size();
size_t newpos = InteractiveRandom() % maxpos;
this->active_playlist.insert(this->active_playlist.begin() + newpos, entry);
/* Make sure to shift up the current playback position if the song was inserted before it */
if ((int)newpos <= this->playlist_position) this->playlist_position++;
} else {
this->active_playlist.push_back(entry);
}
this->SaveCustomPlaylist(this->selected_playlist);
InvalidateWindowData(WC_MUSIC_TRACK_SELECTION, 0);
}
/**
* Remove a song from a custom playlist.
* @param song_index Index in the custom playlist to remove.
*/
void MusicSystem::PlaylistRemove(size_t song_index)
{
if (!this->IsCustomPlaylist()) return;
Playlist &pl = this->standard_playlists[this->selected_playlist];
if (song_index >= pl.size()) return;
/* Remove from "simple" playlists */
PlaylistEntry song = pl[song_index];
pl.erase(pl.begin() + song_index);
this->displayed_playlist.erase(this->displayed_playlist.begin() + song_index);
/* Find in actual active playlist (may be shuffled) and remove,
* if it's the current song restart playback */
for (size_t i = 0; i < this->active_playlist.size(); i++) {
Playlist::iterator s2 = this->active_playlist.begin() + i;
if (s2->filename == song.filename && s2->cat_index == song.cat_index) {
this->active_playlist.erase(s2);
if ((int)i == this->playlist_position && this->IsPlaying()) this->Play();
break;
}
}
this->SaveCustomPlaylist(this->selected_playlist);
InvalidateWindowData(WC_MUSIC_TRACK_SELECTION, 0);
}
/**
* Remove all songs from the current custom playlist.
* Effectively stops playback too.
*/
void MusicSystem::PlaylistClear()
{
if (!this->IsCustomPlaylist()) return;
this->standard_playlists[this->selected_playlist].clear();
this->ChangePlaylist(this->selected_playlist);
this->SaveCustomPlaylist(this->selected_playlist);
}
/**
* Change playlist position pointer by the given offset, making sure to keep it within valid range.
* If the playlist is empty, position is always set to 0.
* @param ofs Amount to move playlist position by.
*/
void MusicSystem::ChangePlaylistPosition(int ofs)
{
if (this->active_playlist.empty()) {
this->playlist_position = 0;
} else {
this->playlist_position += ofs;
while (this->playlist_position >= (int)this->active_playlist.size()) this->playlist_position -= (int)this->active_playlist.size();
while (this->playlist_position < 0) this->playlist_position += (int)this->active_playlist.size();
}
}
/**
* Save a custom playlist to settings after modification.
* @param pl Playlist to store back
*/
void MusicSystem::SaveCustomPlaylist(PlaylistChoices pl)
{
byte *settings_pl;
if (pl == PLCH_CUSTOM1) {
settings_pl = _settings_client.music.custom_1;
} else if (pl == PLCH_CUSTOM2) {
settings_pl = _settings_client.music.custom_2;
} else {
return;
}
size_t num = 0;
MemSetT(settings_pl, 0, NUM_SONGS_PLAYLIST);
for (Playlist::const_iterator song = this->standard_playlists[pl].begin(); song != this->standard_playlists[pl].end(); ++song) {
/* Music set indices in the settings playlist are 1-based, 0 means unused slot */
settings_pl[num++] = (byte)song->set_index + 1;
}
}
/**
* Check music playback status and start/stop/song-finished.
* Called from main loop.
*/
void MusicLoop()
{
_music.CheckStatus();
}
/**
* Change the configured music set and reset playback
* @param index Index of music set to switch to
*/
void ChangeMusicSet(int index)
{
if (BaseMusic::GetIndexOfUsedSet() == index) return;
_music.ChangeMusicSet(BaseMusic::GetSet(index)->name);
}
/**
* Prepare the music system for use.
* Called from \c InitializeGame
*/
void InitializeMusic()
{
_music.BuildPlaylists();
}
struct MusicTrackSelectionWindow : public Window {
MusicTrackSelectionWindow(WindowDesc *desc, WindowNumber number) : Window(desc)
{
this->InitNested(number);
this->LowerWidget(WID_MTS_LIST_LEFT);
this->LowerWidget(WID_MTS_LIST_RIGHT);
this->SetWidgetDisabledState(WID_MTS_CLEAR, _settings_client.music.playlist <= 3);
this->LowerWidget(WID_MTS_ALL + _settings_client.music.playlist);
}
void SetStringParameters(int widget) const override
{
switch (widget) {
case WID_MTS_PLAYLIST:
SetDParam(0, STR_MUSIC_PLAYLIST_ALL + _settings_client.music.playlist);
break;
case WID_MTS_CAPTION:
SetDParamStr(0, BaseMusic::GetUsedSet()->name);
break;
}
}
/**
* Some data on this window has become invalid.
* @param data Information about the changed data.
* @param gui_scope Whether the call is done from GUI scope. You may not do everything when not in GUI scope. See #InvalidateWindowData() for details.
*/
void OnInvalidateData(int data = 0, bool gui_scope = true) override
{
if (!gui_scope) return;
for (int i = 0; i < 6; i++) {
this->SetWidgetLoweredState(WID_MTS_ALL + i, i == _settings_client.music.playlist);
}
this->SetWidgetDisabledState(WID_MTS_CLEAR, _settings_client.music.playlist <= 3);
this->SetDirty();
}
void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
{
switch (widget) {
case WID_MTS_PLAYLIST: {
Dimension d = {0, 0};
for (int i = 0; i < 6; i++) {
SetDParam(0, STR_MUSIC_PLAYLIST_ALL + i);
d = maxdim(d, GetStringBoundingBox(STR_PLAYLIST_PROGRAM));
}
d.width += padding.width;
d.height += padding.height;
*size = maxdim(*size, d);
break;
}
case WID_MTS_LIST_LEFT: case WID_MTS_LIST_RIGHT: {
Dimension d = {0, 0};
for (MusicSystem::Playlist::const_iterator song = _music.music_set.begin(); song != _music.music_set.end(); ++song) {
SetDParam(0, song->tracknr);
SetDParam(1, 2);
SetDParamStr(2, song->songname);
Dimension d2 = GetStringBoundingBox(STR_PLAYLIST_TRACK_NAME);
d.width = std::max(d.width, d2.width);
d.height += d2.height;
}
d.width += padding.width;
d.height += padding.height;
*size = maxdim(*size, d);
break;
}
}
}
void DrawWidget(const Rect &r, int widget) const override
{
switch (widget) {
case WID_MTS_LIST_LEFT: {
GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), PC_BLACK);
Rect tr = r.Shrink(WidgetDimensions::scaled.framerect);
for (MusicSystem::Playlist::const_iterator song = _music.music_set.begin(); song != _music.music_set.end(); ++song) {
SetDParam(0, song->tracknr);
SetDParam(1, 2);
SetDParamStr(2, song->songname);
DrawString(tr, STR_PLAYLIST_TRACK_NAME);
tr.top += FONT_HEIGHT_SMALL;
}
break;
}
case WID_MTS_LIST_RIGHT: {
GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), PC_BLACK);
Rect tr = r.Shrink(WidgetDimensions::scaled.framerect);
for (MusicSystem::Playlist::const_iterator song = _music.active_playlist.begin(); song != _music.active_playlist.end(); ++song) {
SetDParam(0, song->tracknr);
SetDParam(1, 2);
SetDParamStr(2, song->songname);
DrawString(tr, STR_PLAYLIST_TRACK_NAME);
tr.top += FONT_HEIGHT_SMALL;
}
break;
}
}
}
void OnClick(Point pt, int widget, int click_count) override
{
switch (widget) {
case WID_MTS_LIST_LEFT: { // add to playlist
int y = this->GetRowFromWidget(pt.y, widget, 0, FONT_HEIGHT_SMALL);
_music.PlaylistAdd(y);
break;
}
case WID_MTS_LIST_RIGHT: { // remove from playlist
int y = this->GetRowFromWidget(pt.y, widget, 0, FONT_HEIGHT_SMALL);
_music.PlaylistRemove(y);
break;
}
case WID_MTS_MUSICSET: {
int selected = 0;
ShowDropDownList(this, BuildMusicSetDropDownList(&selected), selected, widget, 0, true, false);
break;
}
case WID_MTS_CLEAR: // clear
_music.PlaylistClear();
break;
case WID_MTS_ALL: case WID_MTS_OLD: case WID_MTS_NEW:
case WID_MTS_EZY: case WID_MTS_CUSTOM1: case WID_MTS_CUSTOM2: // set playlist
_music.ChangePlaylist((MusicSystem::PlaylistChoices)(widget - WID_MTS_ALL));
break;
}
}
void OnDropdownSelect(int widget, int index) override
{
switch (widget) {
case WID_MTS_MUSICSET:
ChangeMusicSet(index);
break;
default:
NOT_REACHED();
}
}
};
static const NWidgetPart _nested_music_track_selection_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_MTS_CAPTION), SetDataTip(STR_PLAYLIST_MUSIC_SELECTION_SETNAME, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_MTS_MUSICSET), SetDataTip(STR_PLAYLIST_CHANGE_SET, STR_PLAYLIST_TOOLTIP_CHANGE_SET),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY),
NWidget(NWID_HORIZONTAL), SetPIP(2, 4, 2),
/* Left panel. */
NWidget(NWID_VERTICAL),
NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_PLAYLIST_TRACK_INDEX, STR_NULL),
NWidget(WWT_PANEL, COLOUR_GREY, WID_MTS_LIST_LEFT), SetMinimalSize(180, 194), SetDataTip(0x0, STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK), EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 2),
EndContainer(),
/* Middle buttons. */
NWidget(NWID_VERTICAL),
NWidget(NWID_SPACER), SetMinimalSize(60, 30), // Space above the first button from the title bar.
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_MTS_ALL), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_ALL, STR_MUSIC_TOOLTIP_SELECT_ALL_TRACKS_PROGRAM),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_MTS_OLD), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_OLD_STYLE, STR_MUSIC_TOOLTIP_SELECT_OLD_STYLE_MUSIC),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_MTS_NEW), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_NEW_STYLE, STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_MTS_EZY), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_EZY_STREET, STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_MTS_CUSTOM1), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_CUSTOM_1, STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_MTS_CUSTOM2), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_CUSTOM_2, STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED),
NWidget(NWID_SPACER), SetMinimalSize(0, 16), // Space above 'clear' button
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_MTS_CLEAR), SetFill(1, 0), SetDataTip(STR_PLAYLIST_CLEAR, STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1),
NWidget(NWID_SPACER), SetFill(0, 1),
EndContainer(),
/* Right panel. */
NWidget(NWID_VERTICAL),
NWidget(WWT_LABEL, COLOUR_GREY, WID_MTS_PLAYLIST), SetDataTip(STR_PLAYLIST_PROGRAM, STR_NULL),
NWidget(WWT_PANEL, COLOUR_GREY, WID_MTS_LIST_RIGHT), SetMinimalSize(180, 194), SetDataTip(0x0, STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK), EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 2),
EndContainer(),
EndContainer(),
EndContainer(),
};
static WindowDesc _music_track_selection_desc(
WDP_AUTO, "music_track", 0, 0,
WC_MUSIC_TRACK_SELECTION, WC_NONE,
0,
_nested_music_track_selection_widgets, lengthof(_nested_music_track_selection_widgets)
);
static void ShowMusicTrackSelection()
{
AllocateWindowDescFront<MusicTrackSelectionWindow>(&_music_track_selection_desc, 0);
}
struct MusicWindow : public Window {
MusicWindow(WindowDesc *desc, WindowNumber number) : Window(desc)
{
this->InitNested(number);
this->LowerWidget(_settings_client.music.playlist + WID_M_ALL);
this->SetWidgetLoweredState(WID_M_SHUFFLE, _settings_client.music.shuffle);
UpdateDisabledButtons();
}
void UpdateDisabledButtons()
{
/* Disable music control widgets if there is no music
* -- except Programme button! So you can still select a music set. */
this->SetWidgetsDisabledState(
BaseMusic::GetUsedSet()->num_available == 0,
WID_M_PREV, WID_M_NEXT, WID_M_STOP, WID_M_PLAY, WID_M_SHUFFLE,
WID_M_ALL, WID_M_OLD, WID_M_NEW, WID_M_EZY, WID_M_CUSTOM1, WID_M_CUSTOM2,
WIDGET_LIST_END
);
}
void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
{
switch (widget) {
/* Make sure that WID_M_SHUFFLE and WID_M_PROGRAMME have the same size.
* This can't be done by using NC_EQUALSIZE as the WID_M_INFO is
* between those widgets and of different size. */
case WID_M_SHUFFLE: case WID_M_PROGRAMME: {
Dimension d = maxdim(GetStringBoundingBox(STR_MUSIC_PROGRAM), GetStringBoundingBox(STR_MUSIC_SHUFFLE));
d.width += padding.width;
d.height += padding.height;
*size = maxdim(*size, d);
break;
}
case WID_M_TRACK_NR: {
Dimension d = GetStringBoundingBox(STR_MUSIC_TRACK_NONE);
d.width += padding.width;
d.height += padding.height;
*size = maxdim(*size, d);
break;
}
case WID_M_TRACK_NAME: {
Dimension d = GetStringBoundingBox(STR_MUSIC_TITLE_NONE);
for (MusicSystem::Playlist::const_iterator song = _music.music_set.begin(); song != _music.music_set.end(); ++song) {
SetDParamStr(0, song->songname);
d = maxdim(d, GetStringBoundingBox(STR_MUSIC_TITLE_NAME));
}
d.width += padding.width;
d.height += padding.height;
*size = maxdim(*size, d);
break;
}
/* Hack-ish: set the proper widget data; only needs to be done once
* per (Re)Init as that's the only time the language changes. */
case WID_M_PREV: this->GetWidget<NWidgetCore>(WID_M_PREV)->widget_data = _current_text_dir == TD_RTL ? SPR_IMG_SKIP_TO_NEXT : SPR_IMG_SKIP_TO_PREV; break;
case WID_M_NEXT: this->GetWidget<NWidgetCore>(WID_M_NEXT)->widget_data = _current_text_dir == TD_RTL ? SPR_IMG_SKIP_TO_PREV : SPR_IMG_SKIP_TO_NEXT; break;
case WID_M_PLAY: this->GetWidget<NWidgetCore>(WID_M_PLAY)->widget_data = _current_text_dir == TD_RTL ? SPR_IMG_PLAY_MUSIC_RTL : SPR_IMG_PLAY_MUSIC; break;
}
}
void DrawWidget(const Rect &r, int widget) const override
{
switch (widget) {
case WID_M_TRACK_NR: {
GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel.left, WidgetDimensions::scaled.bevel.top, 0, WidgetDimensions::scaled.bevel.bottom), PC_BLACK);
if (BaseMusic::GetUsedSet()->num_available == 0) {
break;
}
StringID str = STR_MUSIC_TRACK_NONE;
if (_music.IsPlaying()) {
SetDParam(0, _music.GetCurrentSong().tracknr);
SetDParam(1, 2);
str = STR_MUSIC_TRACK_DIGIT;
}
DrawString(r.Shrink(WidgetDimensions::scaled.framerect), str);
break;
}
case WID_M_TRACK_NAME: {
GfxFillRect(r.Shrink(0, WidgetDimensions::scaled.bevel.top, WidgetDimensions::scaled.bevel.right, WidgetDimensions::scaled.bevel.bottom), PC_BLACK);
StringID str = STR_MUSIC_TITLE_NONE;
MusicSystem::PlaylistEntry entry(_music.GetCurrentSong());
if (BaseMusic::GetUsedSet()->num_available == 0) {
str = STR_MUSIC_TITLE_NOMUSIC;
} else if (_music.IsPlaying()) {
str = STR_MUSIC_TITLE_NAME;
SetDParamStr(0, entry.songname);
}
DrawString(r.Shrink(WidgetDimensions::scaled.framerect), str, TC_FROMSTRING, SA_HOR_CENTER);
break;
}
case WID_M_MUSIC_VOL:
DrawSliderWidget(r, 0, INT8_MAX, _settings_client.music.music_vol, {});
break;
case WID_M_EFFECT_VOL:
DrawSliderWidget(r, 0, INT8_MAX, _settings_client.music.effect_vol, {});
break;
}
}
/**
* Some data on this window has become invalid.
* @param data Information about the changed data.
* @param gui_scope Whether the call is done from GUI scope. You may not do everything when not in GUI scope. See #InvalidateWindowData() for details.
*/
void OnInvalidateData(int data = 0, bool gui_scope = true) override
{
if (!gui_scope) return;
for (int i = 0; i < 6; i++) {
this->SetWidgetLoweredState(WID_M_ALL + i, i == _settings_client.music.playlist);
}
UpdateDisabledButtons();
this->SetDirty();
}
void OnClick(Point pt, int widget, int click_count) override
{
switch (widget) {
case WID_M_PREV: // skip to prev
_music.Prev();
break;
case WID_M_NEXT: // skip to next
_music.Next();
break;
case WID_M_STOP: // stop playing
_music.Stop();
break;
case WID_M_PLAY: // start playing
_music.Play();
break;
case WID_M_MUSIC_VOL: case WID_M_EFFECT_VOL: { // volume sliders
byte &vol = (widget == WID_M_MUSIC_VOL) ? _settings_client.music.music_vol : _settings_client.music.effect_vol;
if (ClickSliderWidget(this->GetWidget<NWidgetBase>(widget)->GetCurrentRect(), pt, 0, INT8_MAX, vol)) {
if (widget == WID_M_MUSIC_VOL) {
MusicDriver::GetInstance()->SetVolume(vol);
} else {
SetEffectVolume(vol);
}
this->SetWidgetDirty(widget);
SetWindowClassesDirty(WC_GAME_OPTIONS);
}
if (click_count > 0) this->mouse_capture_widget = widget;
break;
}
case WID_M_SHUFFLE: // toggle shuffle
if (_music.IsShuffle()) {
_music.Unshuffle();
} else {
_music.Shuffle();
}
this->SetWidgetLoweredState(WID_M_SHUFFLE, _music.IsShuffle());
this->SetWidgetDirty(WID_M_SHUFFLE);
break;
case WID_M_PROGRAMME: // show track selection
ShowMusicTrackSelection();
break;
case WID_M_ALL: case WID_M_OLD: case WID_M_NEW:
case WID_M_EZY: case WID_M_CUSTOM1: case WID_M_CUSTOM2: // playlist
_music.ChangePlaylist((MusicSystem::PlaylistChoices)(widget - WID_M_ALL));
break;
}
}
};
static const NWidgetPart _nested_music_window_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_MUSIC_JAZZ_JUKEBOX_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_SHADEBOX, COLOUR_GREY),
NWidget(WWT_STICKYBOX, COLOUR_GREY),
EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(NWID_VERTICAL),
NWidget(WWT_PANEL, COLOUR_GREY, -1), SetFill(1, 1), EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_PREV), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_PREV, STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_NEXT), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_NEXT, STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_STOP), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_STOP_MUSIC, STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_PLAY), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_PLAY_MUSIC, STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, -1), SetFill(1, 1), EndContainer(),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, WID_M_SLIDERS),
NWidget(NWID_HORIZONTAL), SetPIP(4, 0, 4),
NWidget(NWID_VERTICAL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetFill(1, 0), SetDataTip(STR_MUSIC_MUSIC_VOLUME, STR_NULL),
NWidget(WWT_EMPTY, COLOUR_GREY, WID_M_MUSIC_VOL), SetMinimalSize(67, 0), SetPadding(2), SetMinimalTextLines(1, 0), SetFill(1, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
EndContainer(),
NWidget(NWID_VERTICAL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetFill(1, 0), SetDataTip(STR_MUSIC_EFFECTS_VOLUME, STR_NULL),
NWidget(WWT_EMPTY, COLOUR_GREY, WID_M_EFFECT_VOL), SetMinimalSize(67, 0), SetPadding(2), SetMinimalTextLines(1, 0), SetFill(1, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
EndContainer(),
EndContainer(),
EndContainer(),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, WID_M_BACKGROUND),
NWidget(NWID_HORIZONTAL), SetPIP(6, 0, 6),
NWidget(NWID_VERTICAL),
NWidget(NWID_SPACER), SetFill(0, 1),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_SHUFFLE), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_SHUFFLE, STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE),
NWidget(NWID_SPACER), SetFill(0, 1),
EndContainer(),
NWidget(NWID_VERTICAL), SetPadding(0, 0, 3, 3),
NWidget(WWT_LABEL, COLOUR_GREY, WID_M_TRACK), SetFill(0, 0), SetDataTip(STR_MUSIC_TRACK, STR_NULL),
NWidget(WWT_PANEL, COLOUR_GREY, WID_M_TRACK_NR), EndContainer(),
EndContainer(),
NWidget(NWID_VERTICAL), SetPadding(0, 3, 3, 0),
NWidget(WWT_LABEL, COLOUR_GREY, WID_M_TRACK_TITLE), SetFill(1, 0), SetDataTip(STR_MUSIC_XTITLE, STR_NULL),
NWidget(WWT_PANEL, COLOUR_GREY, WID_M_TRACK_NAME), SetFill(1, 0), EndContainer(),
EndContainer(),
NWidget(NWID_VERTICAL),
NWidget(NWID_SPACER), SetFill(0, 1),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_M_PROGRAMME), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_PROGRAM, STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION),
NWidget(NWID_SPACER), SetFill(0, 1),
EndContainer(),
EndContainer(),
EndContainer(),
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_ALL), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_ALL, STR_MUSIC_TOOLTIP_SELECT_ALL_TRACKS_PROGRAM),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_OLD), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_OLD_STYLE, STR_MUSIC_TOOLTIP_SELECT_OLD_STYLE_MUSIC),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_NEW), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_NEW_STYLE, STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_EZY), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_EZY_STREET, STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_CUSTOM1), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_CUSTOM_1, STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_CUSTOM2), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_CUSTOM_2, STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED),
EndContainer(),
};
static WindowDesc _music_window_desc(
WDP_AUTO, "music", 0, 0,
WC_MUSIC_WINDOW, WC_NONE,
0,
_nested_music_window_widgets, lengthof(_nested_music_window_widgets)
);
void ShowMusicWindow()
{
AllocateWindowDescFront<MusicWindow>(&_music_window_desc, 0);
}
|