comparison gui/ui/gtk/preferences.c @ 33766:515a3b5f291e

Rename the mplayer() symbolic constants. Use prefix MPLAYER for these constants, rename them and use upper case characters. Additionally, don't unnecessarily 'float' parameter fparam in mplayer() calls.
author ib
date Fri, 08 Jul 2011 21:41:34 +0000
parents 99562e7c8b27
children fd05ddb85f03
comparison
equal deleted inserted replaced
33765:c29fc64a28c4 33766:515a3b5f291e
510 #ifdef CONFIG_FREETYPE 510 #ifdef CONFIG_FREETYPE
511 case 0: // font encoding 511 case 0: // font encoding
512 comment=gtk_entry_get_text( GTK_ENTRY( EFontEncoding ) ); 512 comment=gtk_entry_get_text( GTK_ENTRY( EFontEncoding ) );
513 for ( i=0;lEncoding[i].name;i++ ) 513 for ( i=0;lEncoding[i].name;i++ )
514 if ( !gstrcmp( lEncoding[i].comment,comment ) ) break; 514 if ( !gstrcmp( lEncoding[i].comment,comment ) ) break;
515 if ( lEncoding[i].comment ) mplayer( gtkSetFontEncoding,0,lEncoding[i].name ); 515 if ( lEncoding[i].comment ) mplayer( MPLAYER_SET_FONT_ENCODING,0,lEncoding[i].name );
516 break; 516 break;
517 #endif 517 #endif
518 #ifdef CONFIG_ICONV 518 #ifdef CONFIG_ICONV
519 case 1: // sub encoding 519 case 1: // sub encoding
520 comment=gtk_entry_get_text( GTK_ENTRY( ESubEncoding ) ); 520 comment=gtk_entry_get_text( GTK_ENTRY( ESubEncoding ) );
521 for ( i=0;lEncoding[i].name;i++ ) 521 for ( i=0;lEncoding[i].name;i++ )
522 if ( !gstrcmp( lEncoding[i].comment,comment ) ) break; 522 if ( !gstrcmp( lEncoding[i].comment,comment ) ) break;
523 if ( lEncoding[i].comment ) mplayer( gtkSetSubEncoding,0,lEncoding[i].name ); 523 if ( lEncoding[i].comment ) mplayer( MPLAYER_SET_SUB_ENCODING,0,lEncoding[i].name );
524 else mplayer( gtkSetSubEncoding,0,NULL ); 524 else mplayer( MPLAYER_SET_SUB_ENCODING,0,NULL );
525 break; 525 break;
526 #endif 526 #endif
527 } 527 }
528 } 528 }
529 #endif 529 #endif
543 // -- 1. page 543 // -- 1. page
544 gtkEnableAudioEqualizer=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ) ); 544 gtkEnableAudioEqualizer=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ) );
545 gtkAOExtraStereo=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBExtraStereo ) ); 545 gtkAOExtraStereo=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBExtraStereo ) );
546 gtkAONorm=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNormalize ) ); 546 gtkAONorm=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNormalize ) );
547 soft_vol=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSoftwareMixer ) ); 547 soft_vol=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSoftwareMixer ) );
548 mplayer( gtkSetExtraStereo,HSExtraStereoMuladj->value,NULL ); 548 mplayer( MPLAYER_SET_EXTRA_STEREO,HSExtraStereoMuladj->value,NULL );
549 audio_delay=HSAudioDelayadj->value; 549 audio_delay=HSAudioDelayadj->value;
550 550
551 gaddlist( &audio_driver_list,ao_driver[0] ); 551 gaddlist( &audio_driver_list,ao_driver[0] );
552 gaddlist( &video_driver_list,vo_driver[0] ); 552 gaddlist( &video_driver_list,vo_driver[0] );
553 553
586 586
587 587
588 // --- 4. page 588 // --- 4. page
589 setdup( &font_name,gtk_entry_get_text( GTK_ENTRY( prEFontName ) ) ); 589 setdup( &font_name,gtk_entry_get_text( GTK_ENTRY( prEFontName ) ) );
590 #ifndef CONFIG_FREETYPE 590 #ifndef CONFIG_FREETYPE
591 mplayer( gtkSetFontFactor,HSFontFactoradj->value,NULL ); 591 mplayer( MPLAYER_SET_FONT_FACTOR,HSFontFactoradj->value,NULL );
592 #else 592 #else
593 mplayer( gtkSetFontBlur,HSFontBluradj->value,NULL ); 593 mplayer( MPLAYER_SET_FONT_BLUR,HSFontBluradj->value,NULL );
594 mplayer( gtkSetFontOutLine,HSFontOutLineadj->value,NULL ); 594 mplayer( MPLAYER_SET_FONT_OUTLINE,HSFontOutLineadj->value,NULL );
595 mplayer( gtkSetFontTextScale,HSFontTextScaleadj->value,NULL ); 595 mplayer( MPLAYER_SET_FONT_TEXTSCALE,HSFontTextScaleadj->value,NULL );
596 mplayer( gtkSetFontOSDScale,HSFontOSDScaleadj->value,NULL ); 596 mplayer( MPLAYER_SET_FONT_OSDSCALE,HSFontOSDScaleadj->value,NULL );
597 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontNoAutoScale ) ) ) mplayer( gtkSetFontAutoScale,0,NULL ); 597 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontNoAutoScale ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,0,NULL );
598 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleHeight ) ) ) mplayer( gtkSetFontAutoScale,1,NULL ); 598 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleHeight ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,1,NULL );
599 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleWidth ) ) ) mplayer( gtkSetFontAutoScale,2,NULL ); 599 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleWidth ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,2,NULL );
600 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleDiagonal ) ) ) mplayer( gtkSetFontAutoScale,3,NULL ); 600 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleDiagonal ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,3,NULL );
601 #endif 601 #endif
602 602
603 // -- 5. page 603 // -- 5. page
604 force_ni=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNonInterlaved ) ); 604 force_ni=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNonInterlaved ) );
605 index_mode=-1; 605 index_mode=-1;
627 gui_save_pos=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ) ); 627 gui_save_pos=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ) );
628 gtkShowVideoWindow=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ); 628 gtkShowVideoWindow=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) );
629 stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) ); 629 stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) );
630 gtkEnablePlayBar=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPlayBar ) ); 630 gtkEnablePlayBar=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPlayBar ) );
631 player_idle_mode=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoIdle ) ); 631 player_idle_mode=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoIdle ) );
632 mplayer( gtkSetAutoq,HSPPQualityadj->value,NULL ); 632 mplayer( MPLAYER_SET_AUTO_QUALITY,HSPPQualityadj->value,NULL );
633 633
634 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) { gtkCacheSize=(int)SBCacheadj->value; gtkCacheOn=1; } 634 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) { gtkCacheSize=(int)SBCacheadj->value; gtkCacheOn=1; }
635 else gtkCacheOn=0; 635 else gtkCacheOn=0;
636 636
637 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAutoSync ) ) ) { gtkAutoSync=(int)SBAutoSyncadj->value; gtkAutoSyncOn=1; } 637 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAutoSync ) ) ) { gtkAutoSync=(int)SBAutoSyncadj->value; gtkAutoSyncOn=1; }
676 { 676 {
677 switch ( (int)user_data ) 677 switch ( (int)user_data )
678 { 678 {
679 case 0: // extra stereo coefficient 679 case 0: // extra stereo coefficient
680 if ( !guiInfo.Playing ) break; 680 if ( !guiInfo.Playing ) break;
681 mplayer( gtkSetExtraStereo,HSExtraStereoMuladj->value,NULL ); 681 mplayer( MPLAYER_SET_EXTRA_STEREO,HSExtraStereoMuladj->value,NULL );
682 break; 682 break;
683 case 1: // audio delay 683 case 1: // audio delay
684 audio_delay=HSAudioDelayadj->value; 684 audio_delay=HSAudioDelayadj->value;
685 break; 685 break;
686 case 2: // panscan 686 case 2: // panscan
687 mplayer( gtkSetPanscan,HSPanscanadj->value,NULL ); 687 mplayer( MPLAYER_SET_PANSCAN,HSPanscanadj->value,NULL );
688 break; 688 break;
689 case 3: // sub delay 689 case 3: // sub delay
690 sub_delay=HSSubDelayadj->value; 690 sub_delay=HSSubDelayadj->value;
691 break; 691 break;
692 case 4: // sub position 692 case 4: // sub position
693 sub_pos=(int)HSSubPositionadj->value; 693 sub_pos=(int)HSSubPositionadj->value;
694 break; 694 break;
695 #ifndef CONFIG_FREETYPE 695 #ifndef CONFIG_FREETYPE
696 case 5: // font factor 696 case 5: // font factor
697 mplayer( gtkSetFontFactor,HSFontFactoradj->value,NULL ); 697 mplayer( MPLAYER_SET_FONT_FACTOR,HSFontFactoradj->value,NULL );
698 break; 698 break;
699 #else 699 #else
700 case 6: // font blur 700 case 6: // font blur
701 mplayer( gtkSetFontBlur,HSFontBluradj->value,NULL ); 701 mplayer( MPLAYER_SET_FONT_BLUR,HSFontBluradj->value,NULL );
702 break; 702 break;
703 case 7: // font outline 703 case 7: // font outline
704 mplayer( gtkSetFontOutLine,HSFontOutLineadj->value,NULL ); 704 mplayer( MPLAYER_SET_FONT_OUTLINE,HSFontOutLineadj->value,NULL );
705 break; 705 break;
706 case 8: // text scale 706 case 8: // text scale
707 mplayer( gtkSetFontTextScale,HSFontTextScaleadj->value,NULL ); 707 mplayer( MPLAYER_SET_FONT_TEXTSCALE,HSFontTextScaleadj->value,NULL );
708 break; 708 break;
709 case 9: // osd scale 709 case 9: // osd scale
710 mplayer( gtkSetFontOSDScale,HSFontOSDScaleadj->value,NULL ); 710 mplayer( MPLAYER_SET_FONT_OSDSCALE,HSFontOSDScaleadj->value,NULL );
711 break; 711 break;
712 #endif 712 #endif
713 case 10: // auto quality 713 case 10: // auto quality
714 mplayer( gtkSetAutoq,HSPPQualityadj->value,NULL ); 714 mplayer( MPLAYER_SET_AUTO_QUALITY,HSPPQualityadj->value,NULL );
715 break; 715 break;
716 } 716 }
717 return FALSE; 717 return FALSE;
718 } 718 }
719 719
747 break; 747 break;
748 case 4: 748 case 4:
749 case 5: 749 case 5:
750 case 6: 750 case 6:
751 case 7: 751 case 7:
752 mplayer( gtkSetFontAutoScale,(float)((int)user_data - 4 ),NULL ); 752 mplayer( MPLAYER_SET_FONT_AUTOSCALE,(int)user_data - 4,NULL );
753 break; 753 break;
754 case 8: 754 case 8:
755 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) gtk_widget_set_sensitive( SBCache,TRUE ); 755 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) gtk_widget_set_sensitive( SBCache,TRUE );
756 else gtk_widget_set_sensitive( SBCache,FALSE ); 756 else gtk_widget_set_sensitive( SBCache,FALSE );
757 break; 757 break;