Commit 99deec70 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* implement the extract-button of the bookmarks-window correctly (refs #22)

parent 58f0b81b
......@@ -285,7 +285,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
/* extract */
intf_thread_t * p_intf = VLCIntf;
/*
if( [o_tbl_dataTable numberOfSelectedRows] < 2 )
{
NSBeginAlertSheet(_NS("Invalid selection"), _NS("OK"), \
......@@ -303,7 +303,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
"The stream must be playing or paused for bookmarks to work"));
return;
}
seekpoint_t **pp_bookmarks;
int i_bookmarks ;
int i_first = -1;
......@@ -318,18 +318,18 @@ static VLCBookmarks *_o_sharedInstance = nil;
{
i_first = x;
c = 1;
return;
}
else if (i_second == -1)
{
i_second = x;
c = 2;
return;
}
}
x = (x + 1);
}
msg_Dbg(p_intf, "got the bookmark-indexes");
if( input_Control( p_input, INPUT_GET_BOOKMARKS, &pp_bookmarks, \
&i_bookmarks ) != VLC_SUCCESS )
{
......@@ -337,7 +337,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
msg_Err(p_intf, "bookmarks couldn't be retrieved from core");
return;
}
msg_Dbg(p_intf, "calling for wizard");
msg_Dbg(p_intf, "calling wizard");
[[[VLCMain sharedInstance] getWizard] initWithExtractValuesFrom: \
[[NSNumber numberWithInt: \
......@@ -347,8 +347,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
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");
msg_Dbg(p_intf, "released input");
}
- (IBAction)goToBookmark:(id)sender
......
......@@ -471,6 +471,7 @@ static VLCWizard *_o_sharedInstance = nil;
[o_t1_matrix_strmgOrTrnscd selectCellAtRow:1 column:0];
[[o_t1_matrix_strmgOrTrnscd cellAtRow:0 column:0] setState: NSOffState];
[o_t2_ckb_enblPartExtrct setState: NSOnState];
[self t2_enableExtract: nil];
msg_Dbg(VLCIntf, "wizard interface is set");
[o_wizard_window center];
......@@ -959,12 +960,14 @@ static VLCWizard *_o_sharedInstance = nil;
}
} else {
/* we don't do any transcoding
* -> enabled the encap-formats allowed when streaming content via http
* since this should work fine in most cases */
* -> enabled the encap-formats allowed when streaming content via
* http plus MP4 since this should work fine in most cases */
/* FIXME: choose a selection of encap-formats based upon the
* actually used codecs */
/* enable MPEG PS, MPEG TS, MPEG 1, OGG, RAW and ASF; select MPEG PS */
/* enable MPEG PS, MPEG TS, MPEG 1, OGG, RAW, ASF, MP4 and MOV
* select MPEG PS */
[[o_t5_matrix_encap cellAtRow:0 column:0] setEnabled:YES];
[[o_t5_matrix_encap cellAtRow:1 column:0] setEnabled:YES];
[[o_t5_matrix_encap cellAtRow:2 column:0] setEnabled:YES];
......@@ -972,8 +975,8 @@ static VLCWizard *_o_sharedInstance = nil;
[[o_t5_matrix_encap cellAtRow:4 column:0] setEnabled:YES];
[[o_t5_matrix_encap cellAtRow:5 column:0] setEnabled:YES];
[[o_t5_matrix_encap cellAtRow:6 column:0] setEnabled:NO];
[[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:NO];
[[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:NO];
[[o_t5_matrix_encap cellAtRow:7 column:0] setEnabled:YES];
[[o_t5_matrix_encap cellAtRow:8 column:0] setEnabled:YES];
[[o_t5_matrix_encap cellAtRow:9 column:0] setEnabled:NO];
[[o_t5_matrix_encap cellAtRow:10 column:0] setEnabled:NO];
[o_t5_matrix_encap selectCellAtRow:0 column:0];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment