Commit f664df30 authored by David Fuhrmann's avatar David Fuhrmann

macosx: rename to VLCPLModel

parent a8fa773d
......@@ -29,8 +29,8 @@
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 */; };
1C67C8AA1D58EC1E0079E1C1 /* VLCPLModel.h in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812F31B5599E40052293C /* VLCPLModel.h */; };
1C67C8AB1D58EC290079E1C1 /* VLCPLModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DF812F41B5599E40052293C /* VLCPLModel.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 */; };
......@@ -1324,8 +1324,8 @@
7DF812F01B555C8E0052293C /* KeyboardBacklight.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = KeyboardBacklight.m; path = ../../../modules/gui/macosx/KeyboardBacklight.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>"; };
7DF812F31B5599E40052293C /* VLCPLModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCPLModel.h; path = ../../../modules/gui/macosx/VLCPLModel.h; sourceTree = "<group>"; };
7DF812F41B5599E40052293C /* VLCPLModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCPLModel.m; path = ../../../modules/gui/macosx/VLCPLModel.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>"; };
7DFFA16B16124F38001AF89F /* effects-one-button-pressed-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button-pressed-dark@2x.png"; path = "Resources/mainwindow_dark/effects-one-button-pressed-dark@2x.png"; sourceTree = "<group>"; };
8E49720006417F6800370C9F /* VLCPlaylistInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaylistInfo.h; path = ../../../modules/gui/macosx/VLCPlaylistInfo.h; sourceTree = SOURCE_ROOT; };
......@@ -1924,8 +1924,8 @@
8E55FB800459B0FD00FB3317 /* VLCOutput.m */,
7DF812F11B5599E40052293C /* VLCPLItem.h */,
7DF812F21B5599E40052293C /* VLCPLItem.m */,
7DF812F31B5599E40052293C /* PLModel.h */,
7DF812F41B5599E40052293C /* PLModel.m */,
7DF812F31B5599E40052293C /* VLCPLModel.h */,
7DF812F41B5599E40052293C /* VLCPLModel.m */,
8E9CA1A306D7DEE800B7186C /* prefs_widgets.h */,
8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */,
8ED6C28503E2EB1C0059A3A7 /* prefs.h */,
......@@ -3961,8 +3961,8 @@
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 */,
1C67C8AA1D58EC1E0079E1C1 /* VLCPLModel.h in Sources */,
1C67C8AB1D58EC290079E1C1 /* VLCPLModel.m in Sources */,
7D9516BA1C60B6AB00D14E1A /* VLCStatusBarIcon.m in Sources */,
1CCB5F5B1A62A724004C3E90 /* VLCBookmarksWindowController.h in Sources */,
1CCB5F5C1A62A724004C3E90 /* VLCBookmarksWindowController.m in Sources */,
......
......@@ -49,7 +49,7 @@ libmacosx_plugin_la_SOURCES = \
VLCPlaylist.h VLCPlaylist.m \
VLCPlaylistInfo.h VLCPlaylistInfo.m \
VLCPLItem.h VLCPLItem.m \
PLModel.h PLModel.m \
VLCPLModel.h VLCPLModel.m \
prefs.h prefs.m \
prefs_widgets.h prefs_widgets.m \
PXSourceList.h PXSourceList.m \
......
......@@ -40,7 +40,7 @@
#import <vlc_url.h>
#import <vlc_strings.h>
#import <vlc_services_discovery.h>
#import "PLModel.h"
#import "VLCPLModel.h"
#import "PXSourceList.h"
#import "PXSourceListDataSource.h"
......
......@@ -47,7 +47,7 @@ typedef enum {
ROOT_TYPE_OTHER
} PLRootType;
@interface PLModel : NSObject<NSOutlineViewDataSource>
@interface VLCPLModel : NSObject<NSOutlineViewDataSource>
@property(readonly) VLCPLItem *rootItem;
@property(readonly, copy) NSArray *draggedItems;
......
......@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import "PLModel.h"
#import "VLCPLModel.h"
#import "misc.h" /* VLCByteCountFormatter */
......@@ -45,7 +45,7 @@ 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;
VLCPLModel *model = (__bridge VLCPLModel*)param;
[model performSelectorOnMainThread:@selector(VLCPLItemUpdated) withObject:nil waitUntilDone:NO];
return VLC_SUCCESS;
......@@ -58,7 +58,7 @@ static int VLCPLItemAppended(vlc_object_t *p_this, const char *psz_var,
@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;
VLCPLModel *model = (__bridge VLCPLModel*)param;
[model performSelectorOnMainThread:@selector(VLCPLItemAppended:) withObject:o_val waitUntilDone:NO];
return VLC_SUCCESS;
......@@ -70,7 +70,7 @@ static int VLCPLItemRemoved(vlc_object_t *p_this, const char *psz_var,
{
@autoreleasepool {
NSNumber *o_val = [NSNumber numberWithInt:new_val.i_int];
PLModel *model = (__bridge PLModel*)param;
VLCPLModel *model = (__bridge VLCPLModel*)param;
[model performSelectorOnMainThread:@selector(VLCPLItemRemoved:) withObject:o_val waitUntilDone:NO];
return VLC_SUCCESS;
......@@ -81,7 +81,7 @@ static int PlaybackModeUpdated(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;
VLCPLModel *model = (__bridge VLCPLModel*)param;
[model performSelectorOnMainThread:@selector(playbackModeUpdated) withObject:nil waitUntilDone:NO];
return VLC_SUCCESS;
......@@ -102,7 +102,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
#pragma mark -
@interface PLModel ()
@interface VLCPLModel ()
{
playlist_t *p_playlist;
__weak NSOutlineView *_outlineView;
......@@ -111,7 +111,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
}
@end
@implementation PLModel
@implementation VLCPLModel
#pragma mark -
#pragma mark Init and Stuff
......@@ -467,7 +467,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var,
#pragma mark -
#pragma mark Outline view data source
@implementation PLModel(NSOutlineViewDataSource)
@implementation VLCPLModel(NSOutlineViewDataSource)
- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
{
......
......@@ -24,7 +24,7 @@
*****************************************************************************/
#import "PXSourceList.h"
#import "PLModel.h"
#import "VLCPLModel.h"
#import "VLCPlaylistView.h"
@interface VLCPlaylist : NSResponder<NSOutlineViewDelegate>
......@@ -45,7 +45,7 @@
@property (nonatomic, readwrite, weak) VLCPlaylistView *outlineView;
@property (nonatomic, readwrite, weak) NSTableHeaderView *playlistHeaderView;
- (PLModel *)model;
- (VLCPLModel *)model;
- (void)reloadStyles;
......
......@@ -76,7 +76,7 @@
BOOL b_playlistmenu_nib_loaded;
PLModel *_model;
VLCPLModel *_model;
// information for playlist table columns menu
......@@ -141,7 +141,7 @@
[defaults registerDefaults:appDefaults];
}
- (PLModel *)model
- (VLCPLModel *)model
{
return _model;
}
......@@ -178,7 +178,7 @@
playlist_t * p_playlist = pl_Get(getIntf());
_model = [[PLModel alloc] initWithOutlineView:_outlineView playlist:p_playlist rootItem:p_playlist->p_playing];
_model = [[VLCPLModel alloc] initWithOutlineView:_outlineView playlist:p_playlist rootItem:p_playlist->p_playing];
[_outlineView setDataSource:_model];
[_outlineView reloadData];
......
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