Skip to content

Commit

Permalink
macosx: Rename the Playlist related class files to match the class name
Browse files Browse the repository at this point in the history
This renames the playlist related class files to match the class name,
which makes it easier to find the which belongs to a certain class and
follows common Cocoa/Obj C file naming conventions.

Signed-off-by: Felix Paul Kühne <[email protected]>
  • Loading branch information
ePirat authored and fkuehne committed Oct 12, 2015
1 parent 4d692bf commit e9db84d
Show file tree
Hide file tree
Showing 20 changed files with 58 additions and 59 deletions.
40 changes: 20 additions & 20 deletions extras/package/macosx/vlc.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -406,10 +406,10 @@
1CCB5F7A1A62A724004C3E90 /* open.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28203E2EB1C0059A3A7 /* open.m */; };
1CCB5F7B1A62A724004C3E90 /* output.h in Sources */ = {isa = PBXBuildFile; fileRef = 8E55FB7F0459B0FD00FB3317 /* output.h */; };
1CCB5F7C1A62A724004C3E90 /* output.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E55FB800459B0FD00FB3317 /* output.m */; };
1CCB5F7D1A62A724004C3E90 /* playlist.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28303E2EB1C0059A3A7 /* playlist.h */; };
1CCB5F7E1A62A724004C3E90 /* playlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28403E2EB1C0059A3A7 /* playlist.m */; };
1CCB5F7F1A62A724004C3E90 /* playlistinfo.h in Sources */ = {isa = PBXBuildFile; fileRef = 8E49720006417F6800370C9F /* playlistinfo.h */; };
1CCB5F801A62A724004C3E90 /* playlistinfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E49720106417F6800370C9F /* playlistinfo.m */; };
1CCB5F7D1A62A724004C3E90 /* VLCPlaylist.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */; };
1CCB5F7E1A62A724004C3E90 /* VLCPlaylist.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */; };
1CCB5F7F1A62A724004C3E90 /* VLCPlaylistInfo.h in Sources */ = {isa = PBXBuildFile; fileRef = 8E49720006417F6800370C9F /* VLCPlaylistInfo.h */; };
1CCB5F801A62A724004C3E90 /* VLCPlaylistInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E49720106417F6800370C9F /* VLCPlaylistInfo.m */; };
1CCB5F811A62A724004C3E90 /* prefs_widgets.h in Sources */ = {isa = PBXBuildFile; fileRef = 8E9CA1A306D7DEE800B7186C /* prefs_widgets.h */; };
1CCB5F821A62A724004C3E90 /* prefs_widgets.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E9CA1A406D7DEE800B7186C /* prefs_widgets.m */; };
1CCB5F831A62A724004C3E90 /* prefs.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28503E2EB1C0059A3A7 /* prefs.h */; };
Expand Down Expand Up @@ -1257,8 +1257,8 @@
7D8BB0B61830311300FAE9B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/DebugMessageVisualizer.xib; sourceTree = "<group>"; };
7D8BB0B91830367200FAE9B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/PlaylistMenu.xib; sourceTree = "<group>"; };
7D8BB0BF1830393300FAE9B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/MainWindow.xib; sourceTree = "<group>"; };
7DA481221B5FC13700917FD7 /* playlistview.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = playlistview.h; path = ../../../modules/gui/macosx/playlistview.h; sourceTree = "<group>"; };
7DA481231B5FC13700917FD7 /* playlistview.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = playlistview.m; path = ../../../modules/gui/macosx/playlistview.m; sourceTree = "<group>"; };
7DA481221B5FC13700917FD7 /* VLCPlaylistView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCPlaylistView.h; path = ../../../modules/gui/macosx/VLCPlaylistView.h; sourceTree = "<group>"; };
7DA481231B5FC13700917FD7 /* VLCPlaylistView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCPlaylistView.m; path = ../../../modules/gui/macosx/VLCPlaylistView.m; sourceTree = "<group>"; };
7DB65D5218ABD6380053B874 /* AddonsWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AddonsWindowController.h; path = ../../../modules/gui/macosx/AddonsWindowController.h; sourceTree = SOURCE_ROOT; };
7DB65D5318ABD6380053B874 /* AddonsWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AddonsWindowController.m; path = ../../../modules/gui/macosx/AddonsWindowController.m; sourceTree = SOURCE_ROOT; };
7DB65D5518ABD6490053B874 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/AddonManager.xib; sourceTree = "<group>"; };
Expand All @@ -1277,8 +1277,8 @@
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>"; };
7DFFA16B16124F38001AF89F /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "Resources/mainwindow_dark/[email protected]"; sourceTree = "<group>"; };
8E49720006417F6800370C9F /* playlistinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playlistinfo.h; path = ../../../modules/gui/macosx/playlistinfo.h; sourceTree = SOURCE_ROOT; };
8E49720106417F6800370C9F /* playlistinfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = playlistinfo.m; path = ../../../modules/gui/macosx/playlistinfo.m; sourceTree = SOURCE_ROOT; };
8E49720006417F6800370C9F /* VLCPlaylistInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaylistInfo.h; path = ../../../modules/gui/macosx/VLCPlaylistInfo.h; sourceTree = SOURCE_ROOT; };
8E49720106417F6800370C9F /* VLCPlaylistInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlaylistInfo.m; path = ../../../modules/gui/macosx/VLCPlaylistInfo.m; sourceTree = SOURCE_ROOT; };
8E55FB7F0459B0FD00FB3317 /* output.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = output.h; path = ../../../modules/gui/macosx/output.h; sourceTree = SOURCE_ROOT; };
8E55FB800459B0FD00FB3317 /* output.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = output.m; path = ../../../modules/gui/macosx/output.m; sourceTree = SOURCE_ROOT; };
8E6BC6F6041643860059A3A7 /* applescript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = applescript.h; path = ../../../modules/gui/macosx/applescript.h; sourceTree = SOURCE_ROOT; };
Expand All @@ -1294,8 +1294,8 @@
8ED6C28003E2EB1C0059A3A7 /* misc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = misc.m; path = ../../../modules/gui/macosx/misc.m; sourceTree = SOURCE_ROOT; };
8ED6C28103E2EB1C0059A3A7 /* open.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = open.h; path = ../../../modules/gui/macosx/open.h; sourceTree = SOURCE_ROOT; };
8ED6C28203E2EB1C0059A3A7 /* open.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = open.m; path = ../../../modules/gui/macosx/open.m; sourceTree = SOURCE_ROOT; };
8ED6C28303E2EB1C0059A3A7 /* playlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playlist.h; path = ../../../modules/gui/macosx/playlist.h; sourceTree = SOURCE_ROOT; };
8ED6C28403E2EB1C0059A3A7 /* playlist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = playlist.m; path = ../../../modules/gui/macosx/playlist.m; sourceTree = SOURCE_ROOT; };
8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaylist.h; path = ../../../modules/gui/macosx/VLCPlaylist.h; sourceTree = SOURCE_ROOT; };
8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlaylist.m; path = ../../../modules/gui/macosx/VLCPlaylist.m; sourceTree = SOURCE_ROOT; };
8ED6C28503E2EB1C0059A3A7 /* prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prefs.h; path = ../../../modules/gui/macosx/prefs.h; sourceTree = SOURCE_ROOT; };
8ED6C28603E2EB1C0059A3A7 /* prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = prefs.m; path = ../../../modules/gui/macosx/prefs.m; sourceTree = SOURCE_ROOT; };
8EDAC3430440F72D0059A3A7 /* README.MacOSX.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = README.MacOSX.rtf; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -1872,12 +1872,12 @@
8ED6C28203E2EB1C0059A3A7 /* open.m */,
8E55FB7F0459B0FD00FB3317 /* output.h */,
8E55FB800459B0FD00FB3317 /* output.m */,
8ED6C28303E2EB1C0059A3A7 /* playlist.h */,
8ED6C28403E2EB1C0059A3A7 /* playlist.m */,
7DA481221B5FC13700917FD7 /* playlistview.h */,
7DA481231B5FC13700917FD7 /* playlistview.m */,
8E49720006417F6800370C9F /* playlistinfo.h */,
8E49720106417F6800370C9F /* playlistinfo.m */,
8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */,
8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */,
7DA481221B5FC13700917FD7 /* VLCPlaylistView.h */,
7DA481231B5FC13700917FD7 /* VLCPlaylistView.m */,
8E49720006417F6800370C9F /* VLCPlaylistInfo.h */,
8E49720106417F6800370C9F /* VLCPlaylistInfo.m */,
7DF812F11B5599E40052293C /* PLItem.h */,
7DF812F21B5599E40052293C /* PLItem.m */,
7DF812F31B5599E40052293C /* PLModel.h */,
Expand Down Expand Up @@ -3902,10 +3902,10 @@
1CCB5F7B1A62A724004C3E90 /* output.h in Sources */,
1CC25CA81B2C585D0003F994 /* darwinvlc.m in Sources */,
1CCB5F7C1A62A724004C3E90 /* output.m in Sources */,
1CCB5F7D1A62A724004C3E90 /* playlist.h in Sources */,
1CCB5F7E1A62A724004C3E90 /* playlist.m in Sources */,
1CCB5F7F1A62A724004C3E90 /* playlistinfo.h in Sources */,
1CCB5F801A62A724004C3E90 /* playlistinfo.m in Sources */,
1CCB5F7D1A62A724004C3E90 /* VLCPlaylist.h in Sources */,
1CCB5F7E1A62A724004C3E90 /* VLCPlaylist.m in Sources */,
1CCB5F7F1A62A724004C3E90 /* VLCPlaylistInfo.h in Sources */,
1CCB5F801A62A724004C3E90 /* VLCPlaylistInfo.m in Sources */,
1CCB5F811A62A724004C3E90 /* prefs_widgets.h in Sources */,
1CCB5F821A62A724004C3E90 /* prefs_widgets.m in Sources */,
1CCB5F831A62A724004C3E90 /* prefs.h in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion modules/gui/macosx/ControlsBar.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#import "CoreInteraction.h"
#import "MainMenu.h"
#import "fspanel.h"
#import "playlist.h"
#import "VLCPlaylist.h"
#import "CompatibilityFixes.h"

/*****************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion modules/gui/macosx/ConvertAndSave.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#import "ConvertAndSave.h"
#import "intf.h"
#import "playlist.h"
#import "VLCPlaylist.h"
#import "misc.h"
#import "SharedDialogs.h"

Expand Down
2 changes: 1 addition & 1 deletion modules/gui/macosx/CoreInteraction.m
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#import "CoreInteraction.h"
#import "intf.h"
#import "open.h"
#import "playlist.h"
#import "VLCPlaylist.h"
#import <math.h>
#import <vlc_playlist.h>
#import <vlc_input.h>
Expand Down
4 changes: 2 additions & 2 deletions modules/gui/macosx/InputManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#import "intf.h"
#import "MainMenu.h"
#import "MainWindow.h"
#import "playlist.h"
#import "playlistinfo.h"
#import "VLCPlaylist.h"
#import "VLCPlaylistInfo.h"
#import "TrackSynchronization.h"
#import "VideoView.h"

Expand Down
4 changes: 2 additions & 2 deletions modules/gui/macosx/MainMenu.m
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
#import "bookmarks.h"
#import "simple_prefs.h"
#import "coredialogs.h"
#import "playlist.h"
#import "playlistinfo.h"
#import "VLCPlaylist.h"
#import "VLCPlaylistInfo.h"
#import "VideoView.h"
#import "CoreInteraction.h"
#import "MainWindow.h"
Expand Down
2 changes: 1 addition & 1 deletion modules/gui/macosx/MainWindow.m
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#import "AudioEffects.h"
#import "MainMenu.h"
#import "open.h"
#import "playlist.h"
#import "VLCPlaylist.h"
#import "SideBarItem.h"
#import <math.h>
#import <vlc_playlist.h>
Expand Down
6 changes: 3 additions & 3 deletions modules/gui/macosx/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ libmacosx_plugin_la_SOURCES = \
misc.h misc.m \
open.h open.m \
output.h output.m \
playlistview.h playlistview.m \
playlist.h playlist.m \
playlistinfo.h playlistinfo.m \
VLCPlaylistView.h VLCPlaylistView.m \
VLCPlaylist.h VLCPlaylist.m \
VLCPlaylistInfo.h VLCPlaylistInfo.m \
PLItem.h PLItem.m \
PLModel.h PLModel.m \
prefs.h prefs.m \
Expand Down
4 changes: 2 additions & 2 deletions modules/gui/macosx/PLModel.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

#import "misc.h" /* VLCByteCountFormatter */

#import "playlist.h"
#import "VLCPlaylist.h"
#import "StringUtility.h"
#import "intf.h"
#import "ControlsBar.h"
#import "MainMenu.h"
#import "playlistinfo.h"
#import "VLCPlaylistInfo.h"
#import "MainWindow.h"

#ifdef HAVE_CONFIG_H
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*****************************************************************************
* playlist.h: MacOS X interface module
* VLCPlaylist.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2015 VLC authors and VideoLAN
* $Id$
Expand All @@ -25,7 +25,7 @@

#import "PXSourceList.h"
#import "PLModel.h"
#import "playlistview.h"
#import "VLCPlaylistView.h"

@interface VLCPlaylist : NSObject<NSOutlineViewDelegate>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*****************************************************************************
* playlist.m: MacOS X interface module
* VLCPlaylist.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2015 VLC authors and VideoLAN
* $Id$
Expand Down Expand Up @@ -42,9 +42,9 @@
#import "CompatibilityFixes.h"

#import "intf.h"
#import "playlist.h"
#import "VLCPlaylist.h"
#import "MainMenu.h"
#import "playlistinfo.h"
#import "VLCPlaylistInfo.h"
#import "ResumeDialogController.h"

#include <vlc_keys.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*****************************************************************************
* playlistinfo.h: MacOS X interface module
* VLCPlaylistInfo.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2015 VLC authors and VideoLAN
* $Id$
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*****************************************************************************
* playlistinfo.m: MacOS X interface module
* VLCPlaylistInfo.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2015 VLC authors and VideoLAN
* $Id$
Expand All @@ -24,8 +24,8 @@

#import "CompatibilityFixes.h"
#import "intf.h"
#import "playlistinfo.h"
#import "playlist.h"
#import "VLCPlaylistInfo.h"
#import "VLCPlaylist.h"
#import <vlc_url.h>

@interface VLCInfo () <NSOutlineViewDataSource, NSOutlineViewDelegate>
Expand Down Expand Up @@ -529,4 +529,3 @@ - (int)numberOfChildren
}

@end

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*****************************************************************************
* playlist.h: MacOS X interface module
* VLCPlaylistView.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2002-2015 VLC authors and VideoLAN
* $Id$
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*****************************************************************************
* playlistview.m: MacOS X interface module
* VLCPlaylistView.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2003-2015 VLC authors and VideoLAN
* $Id$
Expand All @@ -24,8 +24,8 @@
*****************************************************************************/

#import "intf.h"
#import "playlistview.h"
#import "playlist.h"
#import "VLCPlaylistView.h"
#import "VLCPlaylist.h"

@implementation VLCPlaylistView

Expand Down
4 changes: 2 additions & 2 deletions modules/gui/macosx/VLCVoutWindowController.m
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@

#import "VideoEffects.h"
#import "AudioEffects.h"
#import "playlistinfo.h"
#import "VLCPlaylistInfo.h"
#import "bookmarks.h"
#import "TrackSynchronization.h"
#import "ResumeDialogController.h"
#import "playlist.h"
#import "VLCPlaylist.h"

static atomic_bool b_intf_starting = ATOMIC_VAR_INIT(false);

Expand Down
2 changes: 1 addition & 1 deletion modules/gui/macosx/applescript.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#import "intf.h"
#import "applescript.h"
#import "CoreInteraction.h"
#import "playlist.h"
#import "VLCPlaylist.h"
#import <vlc_url.h>

/*****************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions modules/gui/macosx/intf.m
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
#import "MainMenu.h"
#import "VideoView.h"
#import "prefs.h"
#import "playlist.h"
#import "playlistinfo.h"
#import "VLCPlaylist.h"
#import "VLCPlaylistInfo.h"
#import "open.h"
#import "bookmarks.h"
#import "coredialogs.h"
Expand Down
2 changes: 1 addition & 1 deletion modules/gui/macosx/open.m
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#import <QTKit/QTKit.h>

#import "intf.h"
#import "playlist.h"
#import "VLCPlaylist.h"
#import "open.h"
#import "output.h"
#import "eyetv.h"
Expand Down
12 changes: 6 additions & 6 deletions po/POTFILES.in
Original file line number Diff line number Diff line change
Expand Up @@ -589,12 +589,12 @@ modules/gui/macosx/open.h
modules/gui/macosx/open.m
modules/gui/macosx/output.h
modules/gui/macosx/output.m
modules/gui/macosx/playlist.h
modules/gui/macosx/playlist.m
modules/gui/macosx/playlistinfo.h
modules/gui/macosx/playlistinfo.m
modules/gui/macosx/playlistview.h
modules/gui/macosx/playlistview.m
modules/gui/macosx/VLCPlaylist.h
modules/gui/macosx/VLCPlaylist.m
modules/gui/macosx/VLCPlaylistInfo.h
modules/gui/macosx/VLCPlaylistInfo.m
modules/gui/macosx/VLCPlaylistView.h
modules/gui/macosx/VLCPlaylistView.m
modules/gui/macosx/prefs.h
modules/gui/macosx/prefs.m
modules/gui/macosx/prefs_widgets.h
Expand Down

0 comments on commit e9db84d

Please sign in to comment.