Commit a8fa773d authored by David Fuhrmann's avatar David Fuhrmann

macosx: rename to VLCPLItem

parent 829d2a02
......@@ -28,6 +28,9 @@
1C57690E19DC93620099F5A6 /* topbar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C57690D19DC93620099F5A6 /* topbar_background.png */; };
1C67C8A51D58C0980079E1C1 /* VLCHelpWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C67C8A41D58C0980079E1C1 /* VLCHelpWindowController.m */; };
1C67C8A81D58C0A40079E1C1 /* VLCAboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C67C8A71D58C0A40079E1C1 /* VLCAboutWindowController.m */; };
1C67C8A91D58EC1B0079E1C1 /* VLCPLItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812F21B5599E40052293C /* VLCPLItem.m */; };
1C67C8AA1D58EC1E0079E1C1 /* PLModel.h in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812F31B5599E40052293C /* PLModel.h */; };
1C67C8AB1D58EC290079E1C1 /* PLModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812F41B5599E40052293C /* PLModel.m */; };
1C88BA5419DC7B2200645190 /* yosemite-window-close-graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BA2419DC7B2200645190 /* yosemite-window-close-graphite.png */; };
1C88BA5519DC7B2200645190 /* yosemite-window-close-graphite@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BA2519DC7B2200645190 /* yosemite-window-close-graphite@2x.png */; };
1C88BA5619DC7B2200645190 /* yosemite-window-close-on-graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BA2619DC7B2200645190 /* yosemite-window-close-on-graphite.png */; };
......@@ -1319,8 +1322,8 @@
7DF812EE1B555A340052293C /* VLCInputManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCInputManager.m; path = ../../../modules/gui/macosx/VLCInputManager.m; sourceTree = "<group>"; };
7DF812EF1B555C8E0052293C /* KeyboardBacklight.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KeyboardBacklight.h; path = ../../../modules/gui/macosx/KeyboardBacklight.h; sourceTree = "<group>"; };
7DF812F01B555C8E0052293C /* KeyboardBacklight.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = KeyboardBacklight.m; path = ../../../modules/gui/macosx/KeyboardBacklight.m; sourceTree = "<group>"; };
7DF812F11B5599E40052293C /* PLItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PLItem.h; path = ../../../modules/gui/macosx/PLItem.h; sourceTree = "<group>"; };
7DF812F21B5599E40052293C /* PLItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PLItem.m; path = ../../../modules/gui/macosx/PLItem.m; sourceTree = "<group>"; };
7DF812F11B5599E40052293C /* VLCPLItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCPLItem.h; path = ../../../modules/gui/macosx/VLCPLItem.h; sourceTree = "<group>"; };
7DF812F21B5599E40052293C /* VLCPLItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCPLItem.m; path = ../../../modules/gui/macosx/VLCPLItem.m; sourceTree = "<group>"; };
7DF812F31B5599E40052293C /* PLModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PLModel.h; path = ../../../modules/gui/macosx/PLModel.h; sourceTree = "<group>"; };
7DF812F41B5599E40052293C /* PLModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PLModel.m; path = ../../../modules/gui/macosx/PLModel.m; sourceTree = "<group>"; };
7DFFA16A16124F38001AF89F /* effects-one-button-pressed-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark.png"; sourceTree = "<group>"; };
......@@ -1919,8 +1922,8 @@
8ED6C28203E2EB1C0059A3A7 /* VLCOpenWindowController.m */,
8E55FB7F0459B0FD00FB3317 /* VLCOutput.h */,
8E55FB800459B0FD00FB3317 /* VLCOutput.m */,
7DF812F11B5599E40052293C /* PLItem.h */,
7DF812F21B5599E40052293C /* PLItem.m */,
7DF812F11B5599E40052293C /* VLCPLItem.h */,
7DF812F21B5599E40052293C /* VLCPLItem.m */,
7DF812F31B5599E40052293C /* PLModel.h */,
7DF812F41B5599E40052293C /* PLModel.m */,
8E9CA1A306D7DEE800B7186C /* prefs_widgets.h */,
......@@ -3957,6 +3960,9 @@
1CCB5F581A62A724004C3E90 /* applescript.m in Sources */,
1CCB5F591A62A724004C3E90 /* VLCAudioEffectsWindowController.h in Sources */,
1CCB5F5A1A62A724004C3E90 /* VLCAudioEffectsWindowController.m in Sources */,
1C67C8A91D58EC1B0079E1C1 /* VLCPLItem.m in Sources */,
1C67C8AA1D58EC1E0079E1C1 /* PLModel.h in Sources */,
1C67C8AB1D58EC290079E1C1 /* PLModel.m in Sources */,
7D9516BA1C60B6AB00D14E1A /* VLCStatusBarIcon.m in Sources */,
1CCB5F5B1A62A724004C3E90 /* VLCBookmarksWindowController.h in Sources */,
1CCB5F5C1A62A724004C3E90 /* VLCBookmarksWindowController.m in Sources */,
......
......@@ -48,7 +48,7 @@ libmacosx_plugin_la_SOURCES = \
VLCPlaylistView.h VLCPlaylistView.m \
VLCPlaylist.h VLCPlaylist.m \
VLCPlaylistInfo.h VLCPlaylistInfo.m \
PLItem.h PLItem.m \
VLCPLItem.h VLCPLItem.m \
PLModel.h PLModel.m \
prefs.h prefs.m \
prefs_widgets.h prefs_widgets.m \
......
......@@ -21,7 +21,7 @@
#import <Cocoa/Cocoa.h>
#import "PLItem.h"
#import "VLCPLItem.h"
#include <vlc_common.h>
......@@ -49,7 +49,7 @@ typedef enum {
@interface PLModel : NSObject<NSOutlineViewDataSource>
@property(readonly) PLItem *rootItem;
@property(readonly) VLCPLItem *rootItem;
@property(readonly, copy) NSArray *draggedItems;
- (id)initWithOutlineView:(NSOutlineView *)outlineView playlist:(playlist_t *)pl rootItem:(playlist_item_t *)root;
......@@ -69,7 +69,7 @@ typedef enum {
- (void)updateItem:(input_item_t *)p_input_item;
- (PLItem *)currentlyPlayingItem;
- (VLCPLItem *)currentlyPlayingItem;
- (void)playbackModeUpdated;
......
/*****************************************************************************
* PLItem.m: MacOS X interface module
* VLCPLItem.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2014 VLC authors and VideoLAN
* $Id$
......@@ -41,37 +41,37 @@
#include <vlc_input.h>
#include <vlc_url.h>
static int PLItemUpdated(vlc_object_t *p_this, const char *psz_var,
static int VLCPLItemUpdated(vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t new_val, void *param)
{
@autoreleasepool {
PLModel *model = (__bridge PLModel*)param;
[model performSelectorOnMainThread:@selector(plItemUpdated) withObject:nil waitUntilDone:NO];
[model performSelectorOnMainThread:@selector(VLCPLItemUpdated) withObject:nil waitUntilDone:NO];
return VLC_SUCCESS;
}
}
static int PLItemAppended(vlc_object_t *p_this, const char *psz_var,
static int VLCPLItemAppended(vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t new_val, void *param)
{
@autoreleasepool {
playlist_add_t *p_add = new_val.p_address;
NSArray *o_val = [NSArray arrayWithObjects:[NSNumber numberWithInt:p_add->i_node], [NSNumber numberWithInt:p_add->i_item], nil];
PLModel *model = (__bridge PLModel*)param;
[model performSelectorOnMainThread:@selector(plItemAppended:) withObject:o_val waitUntilDone:NO];
[model performSelectorOnMainThread:@selector(VLCPLItemAppended:) withObject:o_val waitUntilDone:NO];
return VLC_SUCCESS;
}
}
static int PLItemRemoved(vlc_object_t *p_this, const char *psz_var,
static int VLCPLItemRemoved(vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t new_val, void *param)
{
@autoreleasepool {
NSNumber *o_val = [NSNumber numberWithInt:new_val.i_int];
PLModel *model = (__bridge PLModel*)param;
[model performSelectorOnMainThread:@selector(plItemRemoved:) withObject:o_val waitUntilDone:NO];
[model performSelectorOnMainThread:@selector(VLCPLItemRemoved:) withObject:o_val waitUntilDone:NO];
return VLC_SUCCESS;
}
......@@ -124,9 +124,9 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
_outlineView = outlineView;
msg_Dbg(getIntf(), "Initializing playlist model");
var_AddCallback(p_playlist, "item-change", PLItemUpdated, (__bridge void *)self);
var_AddCallback(p_playlist, "playlist-item-append", PLItemAppended, (__bridge void *)self);
var_AddCallback(p_playlist, "playlist-item-deleted", PLItemRemoved, (__bridge void *)self);
var_AddCallback(p_playlist, "item-change", VLCPLItemUpdated, (__bridge void *)self);
var_AddCallback(p_playlist, "playlist-item-append", VLCPLItemAppended, (__bridge void *)self);
var_AddCallback(p_playlist, "playlist-item-deleted", VLCPLItemRemoved, (__bridge void *)self);
var_AddCallback(p_playlist, "random", PlaybackModeUpdated, (__bridge void *)self);
var_AddCallback(p_playlist, "repeat", PlaybackModeUpdated, (__bridge void *)self);
var_AddCallback(p_playlist, "loop", PlaybackModeUpdated, (__bridge void *)self);
......@@ -134,8 +134,8 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
var_AddCallback(p_playlist, "mute", VolumeUpdated, (__bridge void *)self);
PL_LOCK;
_rootItem = [[PLItem alloc] initWithPlaylistItem:root];
[self rebuildPLItem:_rootItem];
_rootItem = [[VLCPLItem alloc] initWithPlaylistItem:root];
[self rebuildVLCPLItem:_rootItem];
PL_UNLOCK;
}
......@@ -145,9 +145,9 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
- (void)dealloc
{
msg_Dbg(getIntf(), "Deinitializing playlist model");
var_DelCallback(p_playlist, "item-change", PLItemUpdated, (__bridge void *)self);
var_DelCallback(p_playlist, "playlist-item-append", PLItemAppended, (__bridge void *)self);
var_DelCallback(p_playlist, "playlist-item-deleted", PLItemRemoved, (__bridge void *)self);
var_DelCallback(p_playlist, "item-change", VLCPLItemUpdated, (__bridge void *)self);
var_DelCallback(p_playlist, "playlist-item-append", VLCPLItemAppended, (__bridge void *)self);
var_DelCallback(p_playlist, "playlist-item-deleted", VLCPLItemRemoved, (__bridge void *)self);
var_DelCallback(p_playlist, "random", PlaybackModeUpdated, (__bridge void *)self);
var_DelCallback(p_playlist, "repeat", PlaybackModeUpdated, (__bridge void *)self);
var_DelCallback(p_playlist, "loop", PlaybackModeUpdated, (__bridge void *)self);
......@@ -158,8 +158,8 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
- (void)changeRootItem:(playlist_item_t *)p_root;
{
PL_ASSERT_LOCKED;
_rootItem = [[PLItem alloc] initWithPlaylistItem:p_root];
[self rebuildPLItem:_rootItem];
_rootItem = [[VLCPLItem alloc] initWithPlaylistItem:p_root];
[self rebuildVLCPLItem:_rootItem];
[_outlineView reloadData];
[_outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO];
......@@ -199,7 +199,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
_retainedRowSelection = 0;
[selectedIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
PLItem *item = [_outlineView itemAtRow: idx];
VLCPLItem *item = [_outlineView itemAtRow: idx];
if (!item)
return;
......@@ -208,7 +208,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
}];
}
- (void)rebuildPLItem:(PLItem *)item
- (void)rebuildVLCPLItem:(VLCPLItem *)item
{
[item clear];
playlist_item_t *p_item = playlist_ItemGetById(p_playlist, [item plItemId]);
......@@ -220,11 +220,11 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
if (p_child->i_flags & PLAYLIST_DBL_FLAG)
continue;
PLItem *child = [[PLItem alloc] initWithPlaylistItem:p_child];
VLCPLItem *child = [[VLCPLItem alloc] initWithPlaylistItem:p_child];
[item addChild:child atPos:currPos++];
if (p_child->i_children >= 0) {
[self rebuildPLItem:child];
[self rebuildVLCPLItem:child];
}
}
......@@ -232,25 +232,25 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
}
- (PLItem *)findItemByPlaylistId:(int)i_pl_id
- (VLCPLItem *)findItemByPlaylistId:(int)i_pl_id
{
return [self findItemInnerByPlaylistId:i_pl_id node:_rootItem];
}
- (PLItem *)findItemInnerByPlaylistId:(int)i_pl_id node:(PLItem *)node
- (VLCPLItem *)findItemInnerByPlaylistId:(int)i_pl_id node:(VLCPLItem *)node
{
if ([node plItemId] == i_pl_id) {
return node;
}
for (NSUInteger i = 0; i < [[node children] count]; ++i) {
PLItem *o_sub_item = [[node children] objectAtIndex:i];
VLCPLItem *o_sub_item = [[node children] objectAtIndex:i];
if ([o_sub_item plItemId] == i_pl_id) {
return o_sub_item;
}
if (![o_sub_item isLeaf]) {
PLItem *o_returned = [self findItemInnerByPlaylistId:i_pl_id node:o_sub_item];
VLCPLItem *o_returned = [self findItemInnerByPlaylistId:i_pl_id node:o_sub_item];
if (o_returned)
return o_returned;
}
......@@ -263,7 +263,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
#pragma mark Core events
- (void)plItemAppended:(NSArray *)valueArray
- (void)VLCPLItemAppended:(NSArray *)valueArray
{
int i_node = [[valueArray firstObject] intValue];
int i_item = [valueArray[1] intValue];
......@@ -278,7 +278,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
userInfo: nil];
}
- (void)plItemRemoved:(NSNumber *)value
- (void)VLCPLItemRemoved:(NSNumber *)value
{
int i_item = [value intValue];
......@@ -294,7 +294,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
userInfo: nil];
}
- (void)plItemUpdated
- (void)VLCPLItemUpdated
{
VLCMain *instance = [VLCMain sharedInstance];
[[instance mainWindow] updateName];
......@@ -304,7 +304,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
- (void)addItem:(int)i_item withParentNode:(int)i_node
{
PLItem *o_parent = [self findItemByPlaylistId:i_node];
VLCPLItem *o_parent = [self findItemByPlaylistId:i_node];
if (!o_parent) {
return;
}
......@@ -322,7 +322,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
if(p_item->p_parent->pp_children[pos] == p_item)
break;
PLItem *o_new_item = [[PLItem alloc] initWithPlaylistItem:p_item];
VLCPLItem *o_new_item = [[VLCPLItem alloc] initWithPlaylistItem:p_item];
PL_UNLOCK;
if (pos < 0)
return;
......@@ -337,12 +337,12 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
- (void)removeItem:(int)i_item
{
PLItem *o_item = [self findItemByPlaylistId:i_item];
VLCPLItem *o_item = [self findItemByPlaylistId:i_item];
if (!o_item) {
return;
}
PLItem *o_parent = [o_item parent];
VLCPLItem *o_parent = [o_item parent];
[o_parent deleteChild:o_item];
if ([o_parent plItemId] == [_rootItem plItemId])
......@@ -359,7 +359,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
PL_UNLOCK;
return;
}
PLItem *item = [self findItemByPlaylistId:pl_item->i_id];
VLCPLItem *item = [self findItemByPlaylistId:pl_item->i_id];
PL_UNLOCK;
if (!item)
......@@ -374,9 +374,9 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
}
- (PLItem *)currentlyPlayingItem
- (VLCPLItem *)currentlyPlayingItem
{
PLItem *item = nil;
VLCPLItem *item = nil;
PL_LOCK;
playlist_item_t *p_current = playlist_CurrentPlayingItem(p_playlist);
......@@ -442,7 +442,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
playlist_RecursiveNodeSort(p_playlist, p_root, i_column, i_mode);
[self rebuildPLItem:_rootItem];
[self rebuildVLCPLItem:_rootItem];
[_outlineView reloadData];
PL_UNLOCK;
}
......@@ -457,7 +457,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
}
playlist_LiveSearchUpdate(p_playlist, p_root, [o_search UTF8String],
true);
[self rebuildPLItem:_rootItem];
[self rebuildVLCPLItem:_rootItem];
[_outlineView reloadData];
PL_UNLOCK;
}
......@@ -582,7 +582,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
#pragma mark -
#pragma mark Drag and Drop support
- (BOOL)isItem: (PLItem *)p_item inNode: (PLItem *)p_node
- (BOOL)isItem: (VLCPLItem *)p_item inNode: (VLCPLItem *)p_node
{
while(p_item) {
if ([p_item plItemId] == [p_node plItemId]) {
......@@ -654,8 +654,8 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
const NSUInteger draggedItemsCount = [_draggedItems count];
for (NSInteger i = 0; i < [o_filteredItems count]; i++) {
for (NSUInteger j = 0; j < draggedItemsCount; j++) {
PLItem *itemToCheck = [o_filteredItems objectAtIndex:i];
PLItem *nodeToTest = [_draggedItems objectAtIndex:j];
VLCPLItem *itemToCheck = [o_filteredItems objectAtIndex:i];
VLCPLItem *nodeToTest = [_draggedItems objectAtIndex:j];
if ([itemToCheck plItemId] == [nodeToTest plItemId])
continue;
......@@ -705,7 +705,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
// rebuild our model
NSUInteger filteredItemsCount = [o_filteredItems count];
for(NSUInteger i = 0; i < filteredItemsCount; ++i) {
PLItem *o_item = [o_filteredItems objectAtIndex:i];
VLCPLItem *o_item = [o_filteredItems objectAtIndex:i];
NSLog(@"delete child from parent %p", [o_item parent]);
[[o_item parent] deleteChild:o_item];
[targetItem addChild:o_item atPos:index + i];
......
/*****************************************************************************
* PLItem.h: MacOS X interface module
* VLCPLItem.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2014 VLC authors and VideoLAN
* $Id$
......@@ -23,19 +23,19 @@
#include <vlc_common.h>
@interface PLItem : NSObject
@interface VLCPLItem : NSObject
@property(readonly, copy) NSMutableArray *children;
@property(readonly) int plItemId;
@property(readonly) input_item_t *input;
@property(readwrite, weak) PLItem *parent;
@property(readwrite, weak) VLCPLItem *parent;
- (id)initWithPlaylistItem:(playlist_item_t *)p_item;
- (BOOL)isLeaf;
- (void)clear;
- (void)addChild:(PLItem *)item atPos:(int)pos;
- (void)deleteChild:(PLItem *)child;
- (void)addChild:(VLCPLItem *)item atPos:(int)pos;
- (void)deleteChild:(VLCPLItem *)child;
@end
/*****************************************************************************
* PLItem.m: MacOS X interface module
* VLCPLItem.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2014 VLC authors and VideoLAN
* $Id$
......@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import "PLItem.h"
#import "VLCPLItem.h"
#include <vlc_playlist.h>
#include <vlc_input_item.h>
#pragma mark -
@implementation PLItem
@implementation VLCPLItem
- (id)initWithPlaylistItem:(playlist_item_t *)p_item;
{
......@@ -73,14 +73,14 @@
[_children removeAllObjects];
}
- (void)addChild:(PLItem *)item atPos:(int)pos
- (void)addChild:(VLCPLItem *)item atPos:(int)pos
{
[_children insertObject:item atIndex:pos];
[item setParent: self];
}
- (void)deleteChild:(PLItem *)child
- (void)deleteChild:(VLCPLItem *)child
{
[child setParent:nil];
[_children removeObject:child];
......
......@@ -258,7 +258,7 @@
- (void)currentlyPlayingItemChanged
{
PLItem *item = [[self model] currentlyPlayingItem];
VLCPLItem *item = [[self model] currentlyPlayingItem];
if (!item)
return;
......@@ -267,7 +267,7 @@
if (itemIndex < 0) {
// expand if needed
while (item != nil) {
PLItem *parent = [item parent];
VLCPLItem *parent = [item parent];
if (![_outlineView isExpandable: parent])
break;
......@@ -299,7 +299,7 @@
if (sender == _outlineView && [_outlineView clickedRow] == -1)
return;
PLItem *o_item = [_outlineView itemAtRow:[_outlineView selectedRow]];
VLCPLItem *o_item = [_outlineView itemAtRow:[_outlineView selectedRow]];
if (!o_item)
return;
......@@ -319,7 +319,7 @@
if (selectedRows.count < 1)
return;
PLItem *o_item = [_outlineView itemAtRow:selectedRows.firstIndex];
VLCPLItem *o_item = [_outlineView itemAtRow:selectedRows.firstIndex];
char *psz_url = input_item_GetURI([o_item input]);
if (!psz_url)
......@@ -348,7 +348,7 @@
NSUInteger indexes[i_count];
[o_selected_indexes getIndexes:indexes maxCount:i_count inIndexRange:nil];
for (int i = 0; i < i_count; i++) {
PLItem *o_item = [_outlineView itemAtRow:indexes[i]];
VLCPLItem *o_item = [_outlineView itemAtRow:indexes[i]];
[_outlineView deselectRow: indexes[i]];
if (![o_item isLeaf]) {
......@@ -376,7 +376,7 @@
NSUInteger indexes[i_count];
[o_selected_indexes getIndexes:indexes maxCount:i_count inIndexRange:nil];
for (int i = 0; i < i_count; i++) {
PLItem *o_item = [_outlineView itemAtRow: indexes[i]];
VLCPLItem *o_item = [_outlineView itemAtRow: indexes[i]];
if (![o_item isLeaf])
continue;
......@@ -504,7 +504,7 @@
if (selectedRows.count != 1)
return NO;
PLItem *o_item = [_outlineView itemAtRow:selectedRows.firstIndex];
VLCPLItem *o_item = [_outlineView itemAtRow:selectedRows.firstIndex];
// Check if item exists in file system
char *psz_url = input_item_GetURI([o_item input]);
......
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