Commit 509ed543 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* ALL: ported the WX-bookmarks-window to Cocoa (closes #22)

    - complete functionality except "Extract" (I'm going to fix that next week)
* MainMenu.nib: re-orded the window-menu a bit
* wizard.*: added a method to launch it from the bookmarks
parent 836900c5
......@@ -164,6 +164,9 @@ EXTRA_DIST += \
extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib \
extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib \
extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib \
extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \
extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
extras/MacOSX/Resources/a52.icns \
extras/MacOSX/Resources/aac.icns \
......@@ -563,6 +566,8 @@ VLC-release.app: vlc
wizard.m \
extended.h \
extended.m \
bookmarks.h \
bookmarks.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
......@@ -576,9 +581,9 @@ VLC-release.app: vlc
cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC-release.app;; \
*darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
*darwin8*) cd $(top_builddir)/tmp/extras/Default/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC-release.app;; \
esac
rm -Rf $(top_builddir)/tmp
......@@ -675,6 +680,8 @@ VLC.app: vlc
wizard.m \
extended.h \
extended.m \
bookmarks.h \
bookmarks.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
......@@ -688,9 +695,9 @@ VLC.app: vlc
cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC.app;; \
*darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
*darwin8*) cd $(top_builddir)/tmp/extras/Default/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC.app;; \
esac
rm -Rf $(top_builddir)/tmp
......
{
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
ACTIONS = {
add = id;
clear = id;
edit = id;
"edit_cancel" = id;
"edit_ok" = id;
extract = id;
goToBookmark = id;
myAction = id;
remove = id;
};
CLASS = VLCBookmarks;
LANGUAGE = ObjC;
OUTLETS = {
"o_bookmarks_window" = id;
"o_btn_add" = id;
"o_btn_clear" = id;
"o_btn_edit" = id;
"o_btn_extract" = id;
"o_btn_rm" = id;
"o_edit_btn_cancel" = id;
"o_edit_btn_ok" = id;
"o_edit_fld_bytes" = id;
"o_edit_fld_name" = id;
"o_edit_fld_time" = id;
"o_edit_lbl_bytes" = id;
"o_edit_lbl_name" = id;
"o_edit_lbl_time" = id;
"o_edit_window" = id;
"o_tbl_dataTable" = id;
};
SUPERCLASS = NSObject;
}
);
IBVersion = 1;
}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>69 67 356 240 0 0 1440 878 </string>
<key>IBFramework Version</key>
<string>437.0</string>
<key>IBOpenObjects</key>
<array>
<integer>38</integer>
<integer>5</integer>
</array>
<key>IBSystem Version</key>
<string>8C46</string>
</dict>
</plist>
......@@ -107,6 +107,7 @@
openRecentItem = id;
openWebsite = id;
reportABug = id;
showBookmarks = id;
showExtended = id;
showWizard = id;
timesliderUpdate = id;
......@@ -143,6 +144,7 @@
"o_mi_about" = id;
"o_mi_add_intf" = id;
"o_mi_audiotrack" = id;
"o_mi_bookmarks" = id;
"o_mi_bring_atf" = id;
"o_mi_bwd" = id;
"o_mi_channels" = id;
......
......@@ -21,8 +21,8 @@
<array/>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
<integer>2029</integer>
<integer>29</integer>
<integer>21</integer>
</array>
<key>IBSystem Version</key>
......
......@@ -826,6 +826,7 @@
DCA693C30789DF8700139EC6,
DCFCCDB9085CE18F001E36AF,
DC7F46ED08A183FC0027DB24,
DCE7BD0508A56C8B007B10AE,
);
isa = PBXResourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
......@@ -910,6 +911,8 @@
DC769AB7085DF0DB001A838D,
DC7F46F008A187F60027DB24,
DC7F46F108A187F60027DB24,
DCE7BD0708A5724D007B10AE,
DCE7BD0608A5724D007B10AE,
);
isa = PBXGroup;
name = Classes;
......@@ -2291,6 +2294,48 @@
settings = {
};
};
DCE7BD0308A56C8B007B10AE = {
children = (
DCE7BD0408A56C8B007B10AE,
);
isa = PBXVariantGroup;
name = Bookmarks.nib;
path = "";
refType = 4;
sourceTree = "<group>";
};
DCE7BD0408A56C8B007B10AE = {
isa = PBXFileReference;
lastKnownFileType = wrapper.nib;
name = English;
path = Resources/English.lproj/Bookmarks.nib;
refType = 4;
sourceTree = "<group>";
};
DCE7BD0508A56C8B007B10AE = {
fileRef = DCE7BD0308A56C8B007B10AE;
isa = PBXBuildFile;
settings = {
};
};
DCE7BD0608A5724D007B10AE = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = bookmarks.m;
path = ../../modules/gui/macosx/bookmarks.m;
refType = 2;
sourceTree = SOURCE_ROOT;
};
DCE7BD0708A5724D007B10AE = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
name = bookmarks.h;
path = ../../modules/gui/macosx/bookmarks.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
DCF358B9077F10BA007DB450 = {
children = (
DCF358BA077F10BA007DB450,
......@@ -2323,6 +2368,7 @@
DCA693C10789DF8700139EC6,
DCFCCDB7085CE18F001E36AF,
DC7F46EB08A183FC0027DB24,
DCE7BD0308A56C8B007B10AE,
);
isa = PBXGroup;
name = nibs;
......
......@@ -32,5 +32,7 @@ SOURCES_macosx = \
wizard.m \
extended.h \
extended.m \
bookmarks.h \
bookmarks.m \
$(NULL)
/*****************************************************************************
* bookmarks.h: MacOS X Bookmarks window
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
* $Id$
*
* Authors: Felix Khne <fkuehne@users.sf.net>
*
* 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
* GNU General Public License for more details.
*
* 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.
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <vlc/vlc.h>
@interface VLCBookmarks : NSObject
{
/* main window */
IBOutlet id o_bookmarks_window;
IBOutlet id o_btn_add;
IBOutlet id o_btn_clear;
IBOutlet id o_btn_edit;
IBOutlet id o_btn_extract;
IBOutlet id o_btn_rm;
IBOutlet id o_tbl_dataTable;
/* edit window */
IBOutlet id o_edit_window;
IBOutlet id o_edit_btn_ok;
IBOutlet id o_edit_btn_cancel;
IBOutlet id o_edit_lbl_name;
IBOutlet id o_edit_lbl_time;
IBOutlet id o_edit_lbl_bytes;
IBOutlet id o_edit_fld_name;
IBOutlet id o_edit_fld_time;
IBOutlet id o_edit_fld_bytes;
input_thread_t *p_old_input;
}
- (IBAction)add:(id)sender;
- (IBAction)clear:(id)sender;
- (IBAction)edit:(id)sender;
- (IBAction)extract:(id)sender;
- (IBAction)remove:(id)sender;
- (IBAction)goToBookmark:(id)sender;
- (IBAction)edit_cancel:(id)sender;
- (IBAction)edit_ok:(id)sender;
+ (VLCBookmarks *)sharedInstance;
- (void)initStrings;
- (void)showBookmarks;
- (id)getDataTable;
@end
/*****************************************************************************
* bookmarks.m: MacOS X Bookmarks window
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
* $Id$
*
* Authors: Felix Khne <fkuehne@users.sf.net>
*
* 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
* GNU General Public License for more details.
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Note:
* the code used to bind with VLC's modules is heavily based upon
* ../wxwidgets/bookmarks.cpp, written by Gildas Bazin.
* (he is a member of the VideoLAN team)
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#import "bookmarks.h"
#import "intf.h"
#import "wizard.h"
#import <vlc/intf.h>
/*****************************************************************************
* VLCExtended implementation
*
* implements the GUI functions for the window, the data source and the
* delegate for o_tbl_dataTable
*****************************************************************************/
@implementation VLCBookmarks
static VLCBookmarks *_o_sharedInstance = nil;
+ (VLCBookmarks *)sharedInstance
{
return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
}
- (id)init
{
if (_o_sharedInstance) {
[self dealloc];
} else {
_o_sharedInstance = [super init];
}
return _o_sharedInstance;
}
/*****************************************************************************
* GUI methods
*****************************************************************************/
- (void)awakeFromNib
{
[self initStrings];
}
- (void)dealloc
{
if(p_old_input)
{
free(p_old_input);
}
[super dealloc];
}
- (void)initStrings
{
/* localise the items */
/* main window */
[o_bookmarks_window setTitle: _NS("Bookmarks")];
[o_btn_add setTitle: _NS("Add")];
[o_btn_clear setTitle: _NS("Clear")];
[o_btn_edit setTitle: _NS("Edit")];
[o_btn_extract setTitle: _NS("Extract")];
[o_btn_rm setTitle: _NS("Remove")];
[[[o_tbl_dataTable tableColumnWithIdentifier:@"description"] headerCell] \
setStringValue: _NS("Description")];
[[[o_tbl_dataTable tableColumnWithIdentifier:@"size_offset"] headerCell] \
setStringValue: _NS("Size offset")];
[[[o_tbl_dataTable tableColumnWithIdentifier:@"time_offset"] headerCell] \
setStringValue: _NS("Time offset")];
/* edit window */
[o_edit_btn_ok setTitle: _NS("OK")];
[o_edit_btn_cancel setTitle: _NS("Cancel")];
[o_edit_lbl_name setStringValue: _NS("Name")];
[o_edit_lbl_time setStringValue: _NS("Time")];
[o_edit_lbl_bytes setStringValue: _NS("Bytes")];
}
- (void)showBookmarks
{
/* show the window, called from intf.m */
[o_bookmarks_window displayIfNeeded];
[o_bookmarks_window makeKeyAndOrderFront:nil];
}
- (IBAction)add:(id)sender
{
/* add item to list */
intf_thread_t * p_intf = VLCIntf;
input_thread_t * p_input = (input_thread_t *)vlc_object_find (p_intf, \
VLC_OBJECT_INPUT, FIND_ANYWHERE);
if (!p_input) return;
seekpoint_t bookmark;
vlc_value_t pos;
bookmark.psz_name = NULL;
bookmark.i_byte_offset = 0;
bookmark.i_time_offset = 0;
var_Get(p_intf, "position", &pos);
bookmark.psz_name = _("Untitled");
input_Control( p_input, INPUT_GET_BYTE_POSITION, &bookmark.i_byte_offset );
var_Get( p_input, "time", &pos );
bookmark.i_time_offset = pos.i_time;
input_Control( p_input, INPUT_ADD_BOOKMARK, &bookmark );
vlc_object_release( p_input );
[o_tbl_dataTable reloadData];
}
- (IBAction)clear:(id)sender
{
/* clear table */
intf_thread_t * p_intf = VLCIntf;
input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_intf, \
VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( !p_input ) return;
input_Control( p_input, INPUT_CLEAR_BOOKMARKS );
vlc_object_release( p_input );
[o_tbl_dataTable reloadData];
}
- (IBAction)edit:(id)sender
{
/* put values to the sheet's fields and show sheet */
/* we take the values from the core and not the table, because we cannot
* really trust it */
intf_thread_t * p_intf = VLCIntf;
input_thread_t * p_input = (input_thread_t *)vlc_object_find( p_intf, \
VLC_OBJECT_INPUT, FIND_ANYWHERE );
seekpoint_t **pp_bookmarks;
int i_bookmarks;
char * toBeReturned;
toBeReturned = "";
int i_toBeReturned;
i_toBeReturned = 0;
int row;
row = [o_tbl_dataTable selectedRow];
if(!p_input)
{
return;
}
else if( input_Control( p_input, INPUT_GET_BOOKMARKS, &pp_bookmarks, \
&i_bookmarks ) != VLC_SUCCESS )
{
vlc_object_release( p_input );
return;
}
else if(row < 0)
{
vlc_object_release( p_input );
return;
} else {
[o_edit_fld_name setStringValue: [NSString stringWithUTF8String: \
pp_bookmarks[row]->psz_name]];
[o_edit_fld_time setStringValue: [[NSNumber numberWithInt: \
(pp_bookmarks[row]->i_time_offset / 1000000)] stringValue]];
[o_edit_fld_bytes setStringValue: [[NSNumber numberWithInt: \
pp_bookmarks[row]->i_byte_offset] stringValue]];
}
p_old_input = p_input;
vlc_object_release( p_input );
[NSApp beginSheet: o_edit_window
modalForWindow: o_bookmarks_window
modalDelegate: o_edit_window
didEndSelector: nil
contextInfo: nil];
}
- (IBAction)edit_cancel:(id)sender
{
/* close sheet */
[NSApp endSheet:o_edit_window];
[o_edit_window close];
}
- (IBAction)edit_ok:(id)sender
{
/* save field contents and close sheet */
intf_thread_t * p_intf = VLCIntf;
seekpoint_t **pp_bookmarks;
int i_bookmarks;
input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_intf, \
VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( !p_input )
{
NSBeginCriticalAlertSheet(_NS("No input"), _NS("OK"), \
@"", @"", o_bookmarks_window, nil, nil, nil, nil, _NS("No " \
"input found. The stream must be playing or paused for " \
"bookmarks to work."));
return;
}
if( p_old_input != p_input )
{
NSBeginCriticalAlertSheet(_NS("Input has changed"), _NS("OK"), \
@"", @"", o_bookmarks_window, nil, nil, nil, nil, _NS("Input " \
"has changed, unable to save bookmark. Use \"pause\" while " \
"editing bookmarks to keep the same input."));
vlc_object_release( p_input );
return;
}
if( input_Control( p_input, INPUT_GET_BOOKMARKS, &pp_bookmarks, \
&i_bookmarks ) != VLC_SUCCESS )
{
vlc_object_release( p_input );
return;
}
int i;
i = [o_tbl_dataTable selectedRow];
if( pp_bookmarks[i]->psz_name )
{
free( pp_bookmarks[i]->psz_name );
}
/* FIXME: putting the name to core does not work!! -- FK*/
pp_bookmarks[i]->psz_name = strdup([[o_edit_fld_name stringValue] UTF8String]);
pp_bookmarks[i]->i_byte_offset = [[o_edit_fld_bytes stringValue] intValue];
pp_bookmarks[i]->i_time_offset = ([[o_edit_fld_time stringValue] intValue] * 1000000);
if( input_Control( p_input, INPUT_CHANGE_BOOKMARK, pp_bookmarks[i], i ) \
!= VLC_SUCCESS )
{
msg_Warn( p_intf, "VLCBookmarks: changing bookmark failed");
vlc_object_release( p_input );
return;
}
[o_tbl_dataTable reloadData];
vlc_object_release( p_input );
[NSApp endSheet: o_edit_window];
[o_edit_window close];
}
- (IBAction)extract:(id)sender
{
/* extract */
intf_thread_t * p_intf = VLCIntf;
/*
if( [o_tbl_dataTable numberOfSelectedRows] < 2 )
{
NSBeginAlertSheet(_NS("Invalid selection"), _NS("OK"), \
@"", @"", o_bookmarks_window, nil, nil, nil, nil, _NS("" \
"You must select two bookmarks"));
return;
}
input_thread_t *p_input =
(input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
if( !p_input )
{
NSBeginCriticalAlertSheet(_NS("No input found"), _NS("OK"), \
@"", @"", o_bookmarks_window, nil, nil, nil, nil, _NS("" \
"The stream must be playing or paused for bookmarks to work"));
return;
}
seekpoint_t **pp_bookmarks;
int i_bookmarks ;
int i_first = -1;
int i_second = -1;
int x = 0;
int c = 0;
while (c != 2)
{
if([o_tbl_dataTable isRowSelected:x])
{
if (i_first == -1)
{
i_first = x;
c = 1;
return;
}
else if (i_second == -1)
{
i_second = x;
c = 2;
return;
}
}
x = (x + 1);
}
if( input_Control( p_input, INPUT_GET_BOOKMARKS, &pp_bookmarks, \
&i_bookmarks ) != VLC_SUCCESS )
{
vlc_object_release( p_input );
msg_Err(p_intf, "bookmarks couldn't be retrieved from core");
return;
}
msg_Dbg(p_intf, "calling for wizard");
[[[VLCMain sharedInstance] getWizard] initWithExtractValuesFrom: \
[[NSNumber numberWithInt: \
(pp_bookmarks[i_first]->i_time_offset/1000000)] stringValue] \
to: [[NSNumber numberWithInt: \
(pp_bookmarks[i_second]->i_time_offset/1000000)] stringValue] \
ofItem: [NSString stringWithUTF8String: \
p_input->input.p_item->psz_uri]];
vlc_object_release( p_input );
msg_Dbg(p_intf, "released input");*/
msg_Err(p_intf, "not implemented yet, sorry");
}
- (IBAction)goToBookmark:(id)sender
{
intf_thread_t * p_intf = VLCIntf;
input_thread_t *p_input =