macosx: merge Eric Dudiak's code from GSoC 2008

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

diff --git a/modules/gui/macosx/embeddedwindow.h b/modules/gui/macosx/embeddedwindow.h
index 9831cb0971023269013f7219e3ffeebf0fcf4e3c..1a500a67e71eb7c286cdcb12f30668ce27ee215d 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.h
+++ b/modules/gui/macosx/embeddedwindow.h
@@ -1,16 +1,16 @@
 /*****************************************************************************
  * embeddedwindow.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2005-2006 the VideoLAN team
+ * Copyright (C) 2005-2007 the VideoLAN team
  * $Id$
  *
- * Authors: Benjamin Pracht <bigben at videolan dot org> 
+ * Authors: Benjamin Pracht <bigben at videolan dot org>
  *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program 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
@@ -32,17 +32,36 @@
     IBOutlet id o_btn_backward;
     IBOutlet id o_btn_forward;
     IBOutlet id o_btn_fullscreen;
+    IBOutlet id o_btn_equalizer;
+    IBOutlet id o_btn_playlist;
     IBOutlet id o_btn_play;
-    IBOutlet id o_slider;
+    IBOutlet id o_btn_prev;
+    IBOutlet id o_btn_stop;
+    IBOutlet id o_btn_next;
+    IBOutlet id o_btn_volume_down;
+    IBOutlet id o_volumeslider;
+    IBOutlet id o_btn_volume_up;
+    IBOutlet id o_timeslider;
+    IBOutlet id o_main_pgbar;
     IBOutlet id o_time;
+    IBOutlet id o_scrollfield;
+    IBOutlet id o_horizontal_split;
+    IBOutlet id o_vertical_split;
+    IBOutlet id o_videosubview;
+    IBOutlet id o_sidebar_list;
     IBOutlet id o_view;
+    IBOutlet id o_background_view;
+       IBOutlet id o_searchfield;
+       IBOutlet id o_status;
+       IBOutlet id o_playlist;
+       IBOutlet id o_playlist_view;
+       IBOutlet id o_playlist_table;
+       IBOutlet id o_vlc_main;
 
     NSImage * o_img_play;
     NSImage * o_img_play_pressed;
     NSImage * o_img_pause;
     NSImage * o_img_pause_pressed;
-    
-    NSRect o_saved_frame;
 
     VLCWindow       * o_fullscreen_window;
     NSViewAnimation * o_fullscreen_anim1;
@@ -50,16 +69,35 @@
     NSView          * o_temp_view;
     /* set to yes if we are fullscreen and all animations are over */
     BOOL              b_fullscreen;
-    BOOL              b_animation_lock_alreadylocked;
     NSRecursiveLock * o_animation_lock;
+
+    BOOL              b_window_is_invisible;
+
+    NSSize videoRatio;
+    NSInteger originalLevel;
 }
 
-- (void)setTime:(NSString *)o_arg_ime position:(float)f_position;
-- (void)playStatusUpdated:(int)i_status;
-- (void)setSeekable:(BOOL)b_seekable;
+- (void)controlTintChanged;
+
+- (void)setTime: (NSString *)o_arg_ime position: (float)f_position;
+- (id)getPgbar;
+- (void)playStatusUpdated: (int)i_status;
+- (void)setSeekable: (BOOL)b_seekable;
+- (void)setStop:(BOOL)b_input;
+- (void)setPrev:(BOOL)b_input;
+- (void)setNext:(BOOL)b_input;
+- (void)setVolumeEnabled:(BOOL)b_input;
+
+- (void)setScrollString:(NSString *)o_string;
+
+- (void)setVolumeSlider:(float)f_level;
+
+- (void)setVideoRatio:(NSSize)ratio;
 
 - (NSView *)mainView;
 
+- (IBAction)togglePlaylist:(id)sender;
+
 - (BOOL)isFullscreen;
 
 - (void)lockFullscreenAnimation;
@@ -77,3 +115,47 @@
 - (void)setFrameOnMainThread:(NSData*)packedargs;
 @end
 
+/*****************************************************************************
+ * embeddedbackground
+ *****************************************************************************/
+
+
+@interface embeddedbackground : NSView
+{
+    IBOutlet id o_window;
+    IBOutlet id o_timeslider;
+    IBOutlet id o_main_pgbar;
+    IBOutlet id o_time;
+    IBOutlet id o_scrollfield;
+    IBOutlet id o_searchfield;
+    IBOutlet id o_btn_backward;
+    IBOutlet id o_btn_forward;
+    IBOutlet id o_btn_fullscreen;
+    IBOutlet id o_btn_equalizer;
+    IBOutlet id o_btn_playlist;
+    IBOutlet id o_btn_play;
+    IBOutlet id o_btn_prev;
+    IBOutlet id o_btn_stop;
+    IBOutlet id o_btn_next;
+    IBOutlet id o_btn_volume_down;
+    IBOutlet id o_volumeslider;
+    IBOutlet id o_btn_volume_up;
+    
+    NSPoint dragStart;
+}
+
+@end
+
+/*****************************************************************************
+ * statusbar
+ *****************************************************************************/
+
+
+@interface statusbar : NSView
+{
+    IBOutlet id o_text;
+       
+       BOOL mainwindow;
+}
+
+@end
\ No newline at end of file