X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fmacosx%2Fcontrols.h;h=cd5ab7d7d5ced281c1d37968972ac84b5c514fda;hb=30f4531b43954821a0beb408bcf2438f9b477eac;hp=aea4624d7c9e0aa69c520bd88d8d846f05b29e0b;hpb=27c5a8dd1c6be5a2bc71fa09b94951643e373a0e;p=vlc diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h index aea4624d7c..cd5ab7d7d5 100644 --- a/modules/gui/macosx/controls.h +++ b/modules/gui/macosx/controls.h @@ -1,12 +1,13 @@ /***************************************************************************** * controls.h: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2003 VideoLAN + * Copyright (C) 2002-2006 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen * Christophe Massiot * Derk-Jan Hartman + * Felix Kühne * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,19 +21,35 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#import "fspanel.h" + /***************************************************************************** * VLCControls interface *****************************************************************************/ @interface VLCControls : NSObject { - IBOutlet id o_open; IBOutlet id o_main; IBOutlet id o_btn_fullscreen; IBOutlet id o_volumeslider; + + IBOutlet id o_btn_shuffle; + IBOutlet id o_btn_addNode; + IBOutlet id o_btn_repeat; + + IBOutlet id o_specificTime_cancel_btn; + IBOutlet id o_specificTime_enter_fld; + IBOutlet id o_specificTime_goTo_lbl; + IBOutlet id o_specificTime_ok_btn; + IBOutlet id o_specificTime_win; + IBOutlet id o_specificTime_sec_lbl; + IBOutlet id o_specificTime_stepper; + IBOutlet id o_specificTime_mi; + + VLCFSPanel *o_fs_panel; } - (IBAction)play:(id)sender; @@ -45,6 +62,13 @@ - (IBAction)random:(id)sender; - (IBAction)repeat:(id)sender; - (IBAction)loop:(id)sender; +- (IBAction)repeatButtonAction:(id)sender; + +/* the three ugly helpers again */ +- (void)repeatOne; +- (void)repeatAll; +- (void)repeatOff; +- (void)shuffle; - (IBAction)forward:(id)sender; - (IBAction)backward:(id)sender; @@ -53,9 +77,9 @@ - (IBAction)volumeDown:(id)sender; - (IBAction)mute:(id)sender; - (IBAction)volumeSliderUpdated:(id)sender; -- (void)updateVolumeSlider; - (IBAction)windowAction:(id)sender; +- (BOOL)keyEvent:(NSEvent *)o_event; - (void)setupVarMenuItem:(NSMenuItem *)o_mi target:(vlc_object_t *)p_object @@ -69,6 +93,10 @@ - (IBAction)toggleVar:(id)sender; - (int)toggleVarThread:(id)_o_data; +- (IBAction)goToSpecificTime:(id)sender; + +- (id)getFSPanel; + @end /***************************************************************************** @@ -92,3 +120,15 @@ - (int)type; @end + +/***************************************************************************** + * VLCTimeField interface + ***************************************************************************** + * we need the implementation to catch our click-event in the controller window + *****************************************************************************/ + +@interface VLCTimeField : NSTextField +{ +} +@end +