macosx: create new classes for all controls bar related code

[vlc] / modules / gui / macosx / misc.h

diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h
index d6137ddd57a449ec4d901959d88737cd939b3ef2..3520d3cde93dc2d7067e2948ba3f4dbec868bce9 100644 (file)
--- a/modules/gui/macosx/misc.h
+++ b/modules/gui/macosx/misc.h
@@ -46,8 +46,8 @@
  *****************************************************************************/
 
 @interface NSAnimation (VLCAdditions)
-- (void)setUserInfo: (void *)userInfo;
-- (void *)userInfo;
+@property (readwrite) void * userInfo;
+
 @end
 
 /*****************************************************************************
@@ -58,74 +58,44 @@
 
 @interface NSScreen (VLCAdditions)
 
+@property (readonly) BOOL mainScreen;
+
 + (NSScreen *)screenWithDisplayID: (CGDirectDisplayID)displayID;
-- (BOOL)isMainScreen;
 - (BOOL)isScreen: (NSScreen*)screen;
 - (CGDirectDisplayID)displayID;
 - (void)blackoutOtherScreens;
 + (void)unblackoutScreens;
 @end
 
+
 /*****************************************************************************
- * VLCWindow
- *
- *  Missing extension to NSWindow
+ * VLBrushedMetalImageView
  *****************************************************************************/
 
-@interface VLCWindow : NSWindow <NSWindowDelegate>
-{
-    BOOL b_canBecomeKeyWindow;
-    BOOL b_isset_canBecomeKeyWindow;
-    BOOL b_canBecomeMainWindow;
-    BOOL b_isset_canBecomeMainWindow;
-    BOOL b_isFullscreen;
-    NSViewAnimation *animation;
-}
-
-- (void)setCanBecomeKeyWindow: (BOOL)canBecomeKey;
-
-- (void)setCanBecomeMainWindow: (BOOL)canBecomeMain;
-
-/* animate mode is only supported in >=10.4 */
-- (void)orderFront: (id)sender animate: (BOOL)animate;
-
-/* animate mode is only supported in >=10.4 */
-- (void)orderOut: (id)sender animate: (BOOL)animate;
-
-/* animate mode is only supported in >=10.4 */
-- (void)orderOut: (id)sender animate: (BOOL)animate callback:(NSInvocation *)callback;
-
-/* animate mode is only supported in >=10.4 */
-- (void)closeAndAnimate: (BOOL)animate;
-
-- (void)setFullscreen:(BOOL)b_var;
+@interface VLBrushedMetalImageView : NSImageView
 
-- (BOOL)isFullscreen;
 @end
 
 
 /*****************************************************************************
- * VLBrushedMetalImageView
+ * MPSlider
  *****************************************************************************/
 
-@interface VLBrushedMetalImageView : NSImageView
-{
-
-}
+@interface MPSlider : NSSlider
 
 @end
 
-
 /*****************************************************************************
- * MPSlider
+ * ProgressView
  *****************************************************************************/
 
-@interface MPSlider : NSSlider
-{
-}
+@interface VLCProgressView : NSView
+
+- (void)scrollWheel:(NSEvent *)o_event;
 
 @end
 
+
 /*****************************************************************************
  * TimeLineSlider
  *****************************************************************************/
@@ -134,19 +104,30 @@
 {
     NSImage *o_knob_img;
     NSRect img_rect;
+    BOOL b_dark;
 }
-- (CGFloat)knobPosition;
+@property (readonly) CGFloat knobPosition;
 
 - (void)drawRect:(NSRect)rect;
 - (void)drawKnobInRect:(NSRect)knobRect;
 
 @end
 
+/*****************************************************************************
+ * VLCVolumeSliderCommon
+ *****************************************************************************/
+
+@interface VLCVolumeSliderCommon : NSSlider
+
+- (void)scrollWheel:(NSEvent *)o_event;
+
+@end
+
 /*****************************************************************************
  * ITSlider
  *****************************************************************************/
 
-@interface ITSlider : NSSlider
+@interface ITSlider : VLCVolumeSliderCommon
 {
     NSImage *img;
     NSRect image_rect;
@@ -169,16 +150,13 @@
     NSDictionary * o_string_attributes_dict;
     NSTextAlignment textAlignment;
 }
-
-- (BOOL)timeRemaining;
+@property (readonly) BOOL timeRemaining;
 @end
 
 /*****************************************************************************
  * VLCMainWindowSplitView interface
  *****************************************************************************/
 @interface VLCMainWindowSplitView : NSSplitView
-{
-}
 
 @end
 
@@ -199,8 +177,5 @@
  * VLCThreePartDropView interface
  *****************************************************************************/
 @interface VLCThreePartDropView : VLCThreePartImageView
-{
-
-}
 
 @end