Mercurial > mplayer.hg

comparison gui/dialog/equalizer.c @ 36023:a04e8798227b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Prefix all functions in dialog/tools.c with gtk. Additionally, rename AddHScaler() AddHScale(), AddVScaler() AddVScale() and AddComboBox() AddCombo() first.
author ib
date Sun, 31 Mar 2013 18:08:37 +0000
parents d2d776c8e040
children aebe956868d9
comparison
equal deleted inserted replaced
36022:bf5690e00dc6 36023:a04e8798227b
267 gtk_window_set_wmclass( GTK_WINDOW( Equalizer ),"Equalizer","MPlayer" ); 267 gtk_window_set_wmclass( GTK_WINDOW( Equalizer ),"Equalizer","MPlayer" );
268 268
269 gtk_widget_realize( Equalizer ); 269 gtk_widget_realize( Equalizer );
270 gtkAddIcon( Equalizer ); 270 gtkAddIcon( Equalizer );
271 271
272 vbox1=AddVBox( AddDialogFrame( Equalizer ),0 ); 272 vbox1=gtkAddVBox( gtkAddDialogFrame( Equalizer ),0 );
273 273
274 Notebook=gtk_notebook_new(); 274 Notebook=gtk_notebook_new();
275 gtk_widget_set_name( Notebook,"Notebook" ); 275 gtk_widget_set_name( Notebook,"Notebook" );
276 gtk_widget_show( Notebook ); 276 gtk_widget_show( Notebook );
277 gtk_box_pack_start( GTK_BOX( vbox1 ),Notebook,TRUE,TRUE,0 ); 277 gtk_box_pack_start( GTK_BOX( vbox1 ),Notebook,TRUE,TRUE,0 );
278 gtk_container_set_border_width( GTK_CONTAINER( Notebook ),1 ); 278 gtk_container_set_border_width( GTK_CONTAINER( Notebook ),1 );
279 279
280 hbox1=AddHBox( Notebook,0 ); 280 hbox1=gtkAddHBox( Notebook,0 );
281 281
282 scrolledwindow1=gtk_scrolled_window_new( NULL,NULL ); 282 scrolledwindow1=gtk_scrolled_window_new( NULL,NULL );
283 gtk_widget_set_name( scrolledwindow1,"scrolledwindow1" ); 283 gtk_widget_set_name( scrolledwindow1,"scrolledwindow1" );
284 gtk_widget_show( scrolledwindow1 ); 284 gtk_widget_show( scrolledwindow1 );
285 gtk_box_pack_start( GTK_BOX( hbox1 ),scrolledwindow1,FALSE,FALSE,0 ); 285 gtk_box_pack_start( GTK_BOX( hbox1 ),scrolledwindow1,FALSE,FALSE,0 );
299 gtk_box_pack_start( GTK_BOX( hbox1 ),table1,FALSE,FALSE,0 ); 299 gtk_box_pack_start( GTK_BOX( hbox1 ),table1,FALSE,FALSE,0 );
300 gtk_table_set_row_spacings( GTK_TABLE( table1 ),4 ); 300 gtk_table_set_row_spacings( GTK_TABLE( table1 ),4 );
301 gtk_table_set_col_spacings( GTK_TABLE( table1 ),9 ); 301 gtk_table_set_col_spacings( GTK_TABLE( table1 ),9 );
302 302
303 A3125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 303 A3125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
304 A3125=AddVScaler( A3125adj,NULL,-1 ); 304 A3125=gtkAddVScale( A3125adj,NULL,-1 );
305 gtk_table_attach( GTK_TABLE( table1 ),A3125,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); 305 gtk_table_attach( GTK_TABLE( table1 ),A3125,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
306 306
307 A6250adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 307 A6250adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
308 A6250=AddVScaler( A6250adj,NULL,-1 ); 308 A6250=gtkAddVScale( A6250adj,NULL,-1 );
309 gtk_table_attach( GTK_TABLE( table1 ),A6250,1,2,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); 309 gtk_table_attach( GTK_TABLE( table1 ),A6250,1,2,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
310 310
311 A125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 311 A125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
312 A125=AddVScaler( A125adj,NULL,-1 ); 312 A125=gtkAddVScale( A125adj,NULL,-1 );
313 gtk_table_attach( GTK_TABLE( table1 ),A125,2,3,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); 313 gtk_table_attach( GTK_TABLE( table1 ),A125,2,3,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
314 314
315 A250adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 315 A250adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
316 A250=AddVScaler( A250adj,NULL,-1 ); 316 A250=gtkAddVScale( A250adj,NULL,-1 );
317 gtk_table_attach( GTK_TABLE( table1 ),A250,3,4,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); 317 gtk_table_attach( GTK_TABLE( table1 ),A250,3,4,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
318 318
319 A500adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 319 A500adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
320 A500=AddVScaler( A500adj,NULL,-1 ); 320 A500=gtkAddVScale( A500adj,NULL,-1 );
321 gtk_table_attach( GTK_TABLE( table1 ),A500,4,5,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); 321 gtk_table_attach( GTK_TABLE( table1 ),A500,4,5,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
322 322
323 A1000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 323 A1000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
324 A1000=AddVScaler( A1000adj,NULL,-1 ); 324 A1000=gtkAddVScale( A1000adj,NULL,-1 );
325 gtk_table_attach( GTK_TABLE( table1 ),A1000,5,6,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); 325 gtk_table_attach( GTK_TABLE( table1 ),A1000,5,6,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
326 326
327 A2000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 327 A2000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
328 A2000=AddVScaler( A2000adj,NULL,-1 ); 328 A2000=gtkAddVScale( A2000adj,NULL,-1 );
329 gtk_table_attach( GTK_TABLE( table1 ),A2000,6,7,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); 329 gtk_table_attach( GTK_TABLE( table1 ),A2000,6,7,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
330 330
331 A4000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 331 A4000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
332 A4000=AddVScaler( A4000adj,NULL,-1 ); 332 A4000=gtkAddVScale( A4000adj,NULL,-1 );
333 gtk_table_attach( GTK_TABLE( table1 ),A4000,7,8,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); 333 gtk_table_attach( GTK_TABLE( table1 ),A4000,7,8,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
334 334
335 A8000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 335 A8000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
336 A8000=AddVScaler( A8000adj,NULL,-1 ); 336 A8000=gtkAddVScale( A8000adj,NULL,-1 );
337 gtk_table_attach( GTK_TABLE( table1 ),A8000,8,9,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); 337 gtk_table_attach( GTK_TABLE( table1 ),A8000,8,9,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
338 338
339 A16000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 339 A16000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
340 A16000=AddVScaler( A16000adj,NULL,-1 ); 340 A16000=gtkAddVScale( A16000adj,NULL,-1 );
341 gtk_table_attach( GTK_TABLE( table1 ),A16000,9,10,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); 341 gtk_table_attach( GTK_TABLE( table1 ),A16000,9,10,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
342 342
343 gtk_table_attach( GTK_TABLE( table1 ), 343 gtk_table_attach( GTK_TABLE( table1 ),
344 AddLabel( "31.25",NULL ), 344 gtkAddLabel( "31.25",NULL ),
345 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 345 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
346 346
347 gtk_table_attach( GTK_TABLE( table1 ), 347 gtk_table_attach( GTK_TABLE( table1 ),
348 AddLabel( "62.50",NULL ), 348 gtkAddLabel( "62.50",NULL ),
349 1,2,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 349 1,2,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
350 350
351 gtk_table_attach( GTK_TABLE( table1 ), 351 gtk_table_attach( GTK_TABLE( table1 ),
352 AddLabel( "125",NULL ), 352 gtkAddLabel( "125",NULL ),
353 2,3,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 353 2,3,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
354 354
355 gtk_table_attach( GTK_TABLE( table1 ), 355 gtk_table_attach( GTK_TABLE( table1 ),
356 AddLabel( "250",NULL ), 356 gtkAddLabel( "250",NULL ),
357 3,4,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 357 3,4,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
358 358
359 gtk_table_attach( GTK_TABLE( table1 ), 359 gtk_table_attach( GTK_TABLE( table1 ),
360 AddLabel( "500",NULL ), 360 gtkAddLabel( "500",NULL ),
361 4,5,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 361 4,5,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
362 362
363 gtk_table_attach( GTK_TABLE( table1 ), 363 gtk_table_attach( GTK_TABLE( table1 ),
364 AddLabel( "1000",NULL ), 364 gtkAddLabel( "1000",NULL ),
365 5,6,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 365 5,6,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
366 366
367 gtk_table_attach( GTK_TABLE( table1 ), 367 gtk_table_attach( GTK_TABLE( table1 ),
368 AddLabel( "2000",NULL ), 368 gtkAddLabel( "2000",NULL ),
369 6,7,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 369 6,7,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
370 370
371 gtk_table_attach( GTK_TABLE( table1 ), 371 gtk_table_attach( GTK_TABLE( table1 ),
372 AddLabel( "4000",NULL ), 372 gtkAddLabel( "4000",NULL ),
373 7,8,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 373 7,8,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
374 374
375 gtk_table_attach( GTK_TABLE( table1 ), 375 gtk_table_attach( GTK_TABLE( table1 ),
376 AddLabel( "8000",NULL ), 376 gtkAddLabel( "8000",NULL ),
377 8,9,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 377 8,9,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
378 378
379 gtk_table_attach( GTK_TABLE( table1 ), 379 gtk_table_attach( GTK_TABLE( table1 ),
380 AddLabel( "16000",NULL ), 380 gtkAddLabel( "16000",NULL ),
381 9,10,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 381 9,10,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
382 382
383 gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),0 ), 383 gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),0 ),
384 AddLabel( MSGTR_EQU_Audio,NULL ) ); 384 gtkAddLabel( MSGTR_EQU_Audio,NULL ) );
385 385
386 table1=gtk_table_new( 4,2,FALSE ); 386 table1=gtk_table_new( 4,2,FALSE );
387 gtk_widget_set_name( table1,"table1" ); 387 gtk_widget_set_name( table1,"table1" );
388 gtk_widget_show( table1 ); 388 gtk_widget_show( table1 );
389 gtk_container_add( GTK_CONTAINER( Notebook ),table1 ); 389 gtk_container_add( GTK_CONTAINER( Notebook ),table1 );
390 390
391 gtk_table_attach( GTK_TABLE( table1 ), 391 gtk_table_attach( GTK_TABLE( table1 ),
392 AddLabel( MSGTR_EQU_Contrast,NULL ), 392 gtkAddLabel( MSGTR_EQU_Contrast,NULL ),
393 0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 393 0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
394 394
395 gtk_table_attach( GTK_TABLE( table1 ), 395 gtk_table_attach( GTK_TABLE( table1 ),
396 AddLabel( MSGTR_EQU_Brightness,NULL ), 396 gtkAddLabel( MSGTR_EQU_Brightness,NULL ),
397 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 397 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
398 398
399 gtk_table_attach( GTK_TABLE( table1 ), 399 gtk_table_attach( GTK_TABLE( table1 ),
400 AddLabel( MSGTR_EQU_Hue,NULL ), 400 gtkAddLabel( MSGTR_EQU_Hue,NULL ),
401 0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 401 0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
402 402
403 gtk_table_attach( GTK_TABLE( table1 ), 403 gtk_table_attach( GTK_TABLE( table1 ),
404 AddLabel( MSGTR_EQU_Saturation,NULL ), 404 gtkAddLabel( MSGTR_EQU_Saturation,NULL ),
405 0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 405 0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
406 406
407 VContrastadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); 407 VContrastadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) );
408 VContrast=AddHScaler( VContrastadj,NULL,1 ); 408 VContrast=gtkAddHScale( VContrastadj,NULL,1 );
409 gtk_table_attach( GTK_TABLE( table1 ),VContrast,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 409 gtk_table_attach( GTK_TABLE( table1 ),VContrast,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
410 gtk_widget_set_usize( VContrast,-1,45 ); 410 gtk_widget_set_usize( VContrast,-1,45 );
411 411
412 VBrightnessadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); 412 VBrightnessadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) );
413 VBrightness=AddHScaler( VBrightnessadj,NULL,1 ); 413 VBrightness=gtkAddHScale( VBrightnessadj,NULL,1 );
414 gtk_table_attach( GTK_TABLE( table1 ),VBrightness,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 414 gtk_table_attach( GTK_TABLE( table1 ),VBrightness,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
415 gtk_widget_set_usize( VBrightness,-1,45 ); 415 gtk_widget_set_usize( VBrightness,-1,45 );
416 416
417 VHueadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); 417 VHueadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) );
418 VHue=AddHScaler( VHueadj,NULL,1 ); 418 VHue=gtkAddHScale( VHueadj,NULL,1 );
419 gtk_table_attach( GTK_TABLE( table1 ),VHue,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 419 gtk_table_attach( GTK_TABLE( table1 ),VHue,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
420 gtk_widget_set_usize( VHue,-1,45 ); 420 gtk_widget_set_usize( VHue,-1,45 );
421 421
422 VSaturationadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); 422 VSaturationadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) );
423 VSaturation=AddHScaler( VSaturationadj,NULL,1 ); 423 VSaturation=gtkAddHScale( VSaturationadj,NULL,1 );
424 gtk_table_attach( GTK_TABLE( table1 ),VSaturation,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 424 gtk_table_attach( GTK_TABLE( table1 ),VSaturation,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
425 gtk_widget_set_usize( VSaturation,-1,45 ); 425 gtk_widget_set_usize( VSaturation,-1,45 );
426 426
427 gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),1 ), 427 gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),1 ),
428 AddLabel( MSGTR_EQU_Video,NULL ) ); 428 gtkAddLabel( MSGTR_EQU_Video,NULL ) );
429 429
430 AddHSeparator( vbox1 ); 430 gtkAddHSeparator( vbox1 );
431 431
432 hbuttonbox1=AddHButtonBox( vbox1 ); 432 hbuttonbox1=gtkAddHButtonBox( vbox1 );
433 gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END ); 433 gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END );
434 gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 ); 434 gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 );
435 435
436 Config=AddButton( MSGTR_Config,hbuttonbox1 ); 436 Config=gtkAddButton( MSGTR_Config,hbuttonbox1 );
437 Clear=AddButton( MSGTR_Clear,hbuttonbox1 ); 437 Clear=gtkAddButton( MSGTR_Clear,hbuttonbox1 );
438 Ok=AddButton( MSGTR_Ok,hbuttonbox1 ); 438 Ok=gtkAddButton( MSGTR_Ok,hbuttonbox1 );
439 439
440 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); 440 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
441 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); 441 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
442 442
443 gtk_signal_connect( GTK_OBJECT( Equalizer ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&Equalizer ); 443 gtk_signal_connect( GTK_OBJECT( Equalizer ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&Equalizer );
605 gtk_window_set_wmclass( GTK_WINDOW( EquConfig ),"EquConfig","MPlayer" ); 605 gtk_window_set_wmclass( GTK_WINDOW( EquConfig ),"EquConfig","MPlayer" );
606 606
607 gtk_widget_realize( EquConfig ); 607 gtk_widget_realize( EquConfig );
608 gtkAddIcon( EquConfig ); 608 gtkAddIcon( EquConfig );
609 609
610 vbox1=AddVBox( AddDialogFrame( EquConfig ),0 ); 610 vbox1=gtkAddVBox( gtkAddDialogFrame( EquConfig ),0 );
611 611
612 table1=gtk_table_new( 6,2,FALSE ); 612 table1=gtk_table_new( 6,2,FALSE );
613 gtk_widget_set_name( table1,"table1" ); 613 gtk_widget_set_name( table1,"table1" );
614 gtk_widget_show( table1 ); 614 gtk_widget_show( table1 );
615 gtk_box_pack_start( GTK_BOX( vbox1 ),table1,TRUE,TRUE,0 ); 615 gtk_box_pack_start( GTK_BOX( vbox1 ),table1,TRUE,TRUE,0 );
616 gtk_table_set_row_spacings( GTK_TABLE( table1 ),4 ); 616 gtk_table_set_row_spacings( GTK_TABLE( table1 ),4 );
617 gtk_table_set_col_spacings( GTK_TABLE( table1 ),4 ); 617 gtk_table_set_col_spacings( GTK_TABLE( table1 ),4 );
618 618
619 gtk_table_attach( GTK_TABLE( table1 ), 619 gtk_table_attach( GTK_TABLE( table1 ),
620 AddLabel( MSGTR_EQU_Channel1,NULL ), 620 gtkAddLabel( MSGTR_EQU_Channel1,NULL ),
621 0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 621 0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
622 622
623 gtk_table_attach( GTK_TABLE( table1 ), 623 gtk_table_attach( GTK_TABLE( table1 ),
624 AddLabel( MSGTR_EQU_Channel2,NULL ), 624 gtkAddLabel( MSGTR_EQU_Channel2,NULL ),
625 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 625 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
626 626
627 gtk_table_attach( GTK_TABLE( table1 ), 627 gtk_table_attach( GTK_TABLE( table1 ),
628 AddLabel( MSGTR_EQU_Channel3,NULL ), 628 gtkAddLabel( MSGTR_EQU_Channel3,NULL ),
629 0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 629 0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
630 630
631 gtk_table_attach( GTK_TABLE( table1 ), 631 gtk_table_attach( GTK_TABLE( table1 ),
632 AddLabel( MSGTR_EQU_Channel4,NULL ), 632 gtkAddLabel( MSGTR_EQU_Channel4,NULL ),
633 0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 633 0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
634 634
635 gtk_table_attach( GTK_TABLE( table1 ), 635 gtk_table_attach( GTK_TABLE( table1 ),
636 AddLabel( MSGTR_EQU_Channel5,NULL ), 636 gtkAddLabel( MSGTR_EQU_Channel5,NULL ),
637 0,1,4,5,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 637 0,1,4,5,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
638 638
639 gtk_table_attach( GTK_TABLE( table1 ), 639 gtk_table_attach( GTK_TABLE( table1 ),
640 AddLabel( MSGTR_EQU_Channel6,NULL ), 640 gtkAddLabel( MSGTR_EQU_Channel6,NULL ),
641 0,1,5,6,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 641 0,1,5,6,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
642 642
643 CBChannel1=AddComboBox( NULL ); 643 CBChannel1=gtkAddCombo( NULL );
644 gtk_table_attach( GTK_TABLE( table1 ),CBChannel1,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 644 gtk_table_attach( GTK_TABLE( table1 ),CBChannel1,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
645 645
646 CEChannel1=GTK_COMBO( CBChannel1 )->entry; 646 CEChannel1=GTK_COMBO( CBChannel1 )->entry;
647 gtk_widget_set_name( CEChannel1,"CEChannel1" ); 647 gtk_widget_set_name( CEChannel1,"CEChannel1" );
648 gtk_widget_show( CEChannel1 ); 648 gtk_widget_show( CEChannel1 );
649 649
650 CBChannel2=AddComboBox( NULL ); 650 CBChannel2=gtkAddCombo( NULL );
651 gtk_table_attach( GTK_TABLE( table1 ),CBChannel2,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 651 gtk_table_attach( GTK_TABLE( table1 ),CBChannel2,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
652 652
653 CEChannel2=GTK_COMBO( CBChannel2 )->entry; 653 CEChannel2=GTK_COMBO( CBChannel2 )->entry;
654 gtk_widget_set_name( CEChannel2,"CEChannel2" ); 654 gtk_widget_set_name( CEChannel2,"CEChannel2" );
655 gtk_widget_show( CEChannel2 ); 655 gtk_widget_show( CEChannel2 );
656 656
657 CBChannel3=AddComboBox( NULL ); 657 CBChannel3=gtkAddCombo( NULL );
658 gtk_table_attach( GTK_TABLE( table1 ),CBChannel3,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 658 gtk_table_attach( GTK_TABLE( table1 ),CBChannel3,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
659 659
660 CEChannel3=GTK_COMBO( CBChannel3 )->entry; 660 CEChannel3=GTK_COMBO( CBChannel3 )->entry;
661 gtk_widget_set_name( CEChannel3,"CEChannel3" ); 661 gtk_widget_set_name( CEChannel3,"CEChannel3" );
662 gtk_widget_show( CEChannel3 ); 662 gtk_widget_show( CEChannel3 );
663 663
664 CBChannel4=AddComboBox( NULL ); 664 CBChannel4=gtkAddCombo( NULL );
665 gtk_table_attach( GTK_TABLE( table1 ),CBChannel4,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 665 gtk_table_attach( GTK_TABLE( table1 ),CBChannel4,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
666 666
667 CEChannel4=GTK_COMBO( CBChannel4 )->entry; 667 CEChannel4=GTK_COMBO( CBChannel4 )->entry;
668 gtk_widget_set_name( CEChannel4,"CEChannel4" ); 668 gtk_widget_set_name( CEChannel4,"CEChannel4" );
669 gtk_widget_show( CEChannel4 ); 669 gtk_widget_show( CEChannel4 );
670 670
671 CBChannel5=AddComboBox( NULL ); 671 CBChannel5=gtkAddCombo( NULL );
672 gtk_table_attach( GTK_TABLE( table1 ),CBChannel5,1,2,4,5,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 672 gtk_table_attach( GTK_TABLE( table1 ),CBChannel5,1,2,4,5,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
673 673
674 CEChannel5=GTK_COMBO( CBChannel5 )->entry; 674 CEChannel5=GTK_COMBO( CBChannel5 )->entry;
675 gtk_widget_set_name( CEChannel5,"CEChannel5" ); 675 gtk_widget_set_name( CEChannel5,"CEChannel5" );
676 gtk_widget_show( CEChannel5 ); 676 gtk_widget_show( CEChannel5 );
677 677
678 CBChannel6=AddComboBox( NULL ); 678 CBChannel6=gtkAddCombo( NULL );
679 gtk_table_attach( GTK_TABLE( table1 ),CBChannel6,1,2,5,6,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 679 gtk_table_attach( GTK_TABLE( table1 ),CBChannel6,1,2,5,6,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
680 680
681 CEChannel6=GTK_COMBO( CBChannel6 )->entry; 681 CEChannel6=GTK_COMBO( CBChannel6 )->entry;
682 gtk_widget_set_name( CEChannel6,"CEChannel6" ); 682 gtk_widget_set_name( CEChannel6,"CEChannel6" );
683 gtk_widget_show( CEChannel6 ); 683 gtk_widget_show( CEChannel6 );
684 684
685 AddHSeparator( vbox1 ); 685 gtkAddHSeparator( vbox1 );
686 686
687 hbuttonbox1=AddHButtonBox( vbox1 ); 687 hbuttonbox1=gtkAddHButtonBox( vbox1 );
688 gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END ); 688 gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END );
689 gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 ); 689 gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 );
690 690
691 ecOk=AddButton( MSGTR_Ok,hbuttonbox1 ); 691 ecOk=gtkAddButton( MSGTR_Ok,hbuttonbox1 );
692 ecCancel=AddButton( MSGTR_Cancel,hbuttonbox1 ); 692 ecCancel=gtkAddButton( MSGTR_Cancel,hbuttonbox1 );
693 693
694 gtk_widget_add_accelerator( ecOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); 694 gtk_widget_add_accelerator( ecOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
695 gtk_widget_add_accelerator( ecCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); 695 gtk_widget_add_accelerator( ecCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
696 696
697 gtk_signal_connect( GTK_OBJECT( EquConfig ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&EquConfig ); 697 gtk_signal_connect( GTK_OBJECT( EquConfig ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&EquConfig );