Skip to content
This repository has been archived by the owner on Mar 30, 2021. It is now read-only.

Commit

Permalink
Rename application to 'Radiant Player' for trademark reasons
Browse files Browse the repository at this point in the history
  • Loading branch information
kbhomes committed Mar 26, 2014
1 parent 871feb0 commit 7e238b5
Show file tree
Hide file tree
Showing 15 changed files with 75 additions and 62 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[Google Music for Mac][1]
[Radiant Player for Google Play Music™][1]
=========================

![](https://raw.github.com/kbhomes/GoogleMusicMac/gh-pages/images/application.png)
![](https://raw.github.com/kbhomes/google-music-mac/gh-pages/images/application.png)

Turn Google Music into a separate, beautiful application that integrates with your Mac.
Turn Google Play Music into a separate, beautiful application that integrates with your Mac.

Developed by [Sajid Anwar][2]. Originally created by [James Fator][3] at [JamesFator/GoogleMusicMac][4].

No affiliation with Google.
No affiliation with Google. Google Play is a trademark of Google Inc.

[1]: http://kbhomes.github.io/google-music-mac/
[2]: https://github.com/kbhomes/
Expand Down
32 changes: 16 additions & 16 deletions google-music-mac.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
1A7B687417453E4C001E509E /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A7B687317453E4C001E509E /* WebKit.framework */; };
1A7B68811745ABBD001E509E /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1A7B68801745ABBD001E509E /* icon.icns */; };
2B8FC1C018C9CB0E006D04FF /* google-music-mac.sdef in Resources */ = {isa = PBXBuildFile; fileRef = 2B8FC1BF18C9CB0E006D04FF /* google-music-mac.sdef */; };
2B8FC1C318C9CB16006D04FF /* GoogleMusicScriptCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B8FC1C218C9CB16006D04FF /* GoogleMusicScriptCommand.m */; };
2B8FC1C318C9CB16006D04FF /* RadiantPlayerScriptCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B8FC1C218C9CB16006D04FF /* RadiantPlayerScriptCommand.m */; };
38D0C36DAD0F40F5A7254224 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BABD1B4DDCC34CB291C66033 /* libPods.a */; };
D302E13418B561E100CCD18E /* Preferences.plist in Resources */ = {isa = PBXBuildFile; fileRef = D302E13318B561E100CCD18E /* Preferences.plist */; };
D3091F6318C32961007C8DCD /* Utilities.m in Sources */ = {isa = PBXBuildFile; fileRef = D3091F6218C32961007C8DCD /* Utilities.m */; };
Expand Down Expand Up @@ -49,7 +49,7 @@
/* Begin PBXFileReference section */
1A68DAD61803B588004CBA25 /* CustomWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomWebView.h; sourceTree = "<group>"; };
1A68DAD71803B588004CBA25 /* CustomWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomWebView.m; sourceTree = "<group>"; };
1A7B683C17453E40001E509E /* Google Music.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Google Music.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1A7B683C17453E40001E509E /* Radiant Player.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Radiant Player.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1A7B683F17453E40001E509E /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
1A7B684217453E40001E509E /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
1A7B684317453E40001E509E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
Expand All @@ -65,8 +65,8 @@
1A7B687317453E4C001E509E /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
1A7B68801745ABBD001E509E /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = "<group>"; };
2B8FC1BF18C9CB0E006D04FF /* google-music-mac.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "google-music-mac.sdef"; sourceTree = "<group>"; };
2B8FC1C118C9CB16006D04FF /* GoogleMusicScriptCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GoogleMusicScriptCommand.h; sourceTree = "<group>"; };
2B8FC1C218C9CB16006D04FF /* GoogleMusicScriptCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoogleMusicScriptCommand.m; sourceTree = "<group>"; };
2B8FC1C118C9CB16006D04FF /* RadiantPlayerScriptCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RadiantPlayerScriptCommand.h; sourceTree = "<group>"; };
2B8FC1C218C9CB16006D04FF /* RadiantPlayerScriptCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RadiantPlayerScriptCommand.m; sourceTree = "<group>"; };
A32790DC482A48E18B516D0B /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = "<group>"; };
BABD1B4DDCC34CB291C66033 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
D302E13318B561E100CCD18E /* Preferences.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Preferences.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -144,7 +144,7 @@
1A7B683D17453E40001E509E /* Products */ = {
isa = PBXGroup;
children = (
1A7B683C17453E40001E509E /* Google Music.app */,
1A7B683C17453E40001E509E /* Radiant Player.app */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -215,8 +215,8 @@
isa = PBXGroup;
children = (
2B8FC1BF18C9CB0E006D04FF /* google-music-mac.sdef */,
2B8FC1C118C9CB16006D04FF /* GoogleMusicScriptCommand.h */,
2B8FC1C218C9CB16006D04FF /* GoogleMusicScriptCommand.m */,
2B8FC1C118C9CB16006D04FF /* RadiantPlayerScriptCommand.h */,
2B8FC1C218C9CB16006D04FF /* RadiantPlayerScriptCommand.m */,
);
path = AppleScript;
sourceTree = "<group>";
Expand Down Expand Up @@ -285,9 +285,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
1A7B683B17453E40001E509E /* Google Music */ = {
1A7B683B17453E40001E509E /* Radiant Player */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1A7B686D17453E40001E509E /* Build configuration list for PBXNativeTarget "Google Music" */;
buildConfigurationList = 1A7B686D17453E40001E509E /* Build configuration list for PBXNativeTarget "Radiant Player" */;
buildPhases = (
7A2071DB33B24D5B85C39505 /* Check Pods Manifest.lock */,
1A7B683817453E40001E509E /* Sources */,
Expand All @@ -300,9 +300,9 @@
);
dependencies = (
);
name = "Google Music";
name = "Radiant Player";
productName = GoogleMusic;
productReference = 1A7B683C17453E40001E509E /* Google Music.app */;
productReference = 1A7B683C17453E40001E509E /* Radiant Player.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand All @@ -326,7 +326,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
1A7B683B17453E40001E509E /* Google Music */,
1A7B683B17453E40001E509E /* Radiant Player */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -407,7 +407,7 @@
D3B1668318BB0E43003FCE6B /* DummyWebViewPolicyDelegate.m in Sources */,
1A68DAD81803B588004CBA25 /* CustomWebView.m in Sources */,
D318341B18CFC7C500E8F9B1 /* ApplicationStyle.m in Sources */,
2B8FC1C318C9CB16006D04FF /* GoogleMusicScriptCommand.m in Sources */,
2B8FC1C318C9CB16006D04FF /* RadiantPlayerScriptCommand.m in Sources */,
D3B71C2F18C2D5770041358B /* LastFmPreferencesViewController.m in Sources */,
1A7B684C17453E40001E509E /* main.m in Sources */,
D3DB8FF518BD2AEC00ABE93B /* PlaybackConstants.m in Sources */,
Expand Down Expand Up @@ -525,7 +525,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "google-music-mac/prefix.pch";
INFOPLIST_FILE = "google-music-mac/info.plist";
PRODUCT_NAME = "Google Music";
PRODUCT_NAME = "Radiant Player";
WRAPPER_EXTENSION = app;
};
name = Debug;
Expand All @@ -539,7 +539,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "google-music-mac/prefix.pch";
INFOPLIST_FILE = "google-music-mac/info.plist";
PRODUCT_NAME = "Google Music";
PRODUCT_NAME = "Radiant Player";
WRAPPER_EXTENSION = app;
};
name = Release;
Expand All @@ -556,7 +556,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
1A7B686D17453E40001E509E /* Build configuration list for PBXNativeTarget "Google Music" */ = {
1A7B686D17453E40001E509E /* Build configuration list for PBXNativeTarget "Radiant Player" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1A7B686E17453E40001E509E /* Debug */,
Expand Down
4 changes: 2 additions & 2 deletions google-music-mac/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -307,15 +307,15 @@ - (IBAction) backAction:(id)sender
}

/**
* Increases volume of Google Music by 10.
* Increases volume of Google Play Music by 10.
*/
- (IBAction) volumeUp:(id)sender
{
[webView stringByEvaluatingJavaScriptFromString:@"MusicAPI.Volume.increaseVolume(10)"];
}

/**
* Decreases volume of Google Music by 10.
* Decreases volume of Google Play Music by 10.
*/
- (IBAction) volumeDown:(id)sender
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* GoogleMusicScriptCommand.h
* RadiantPlayerScriptCommand.h
*
* Originally created by Walter Da Col.
*
Expand All @@ -9,5 +9,5 @@

#import <Cocoa/Cocoa.h>

@interface GoogleMusicScriptCommand : NSScriptCommand
@interface RadiantPlayerScriptCommand : NSScriptCommand
@end
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/*
* GoogleMusicScriptCommand.m
* RadiantPlayerScriptCommand.m
*
* Originally created by Walter Da Col.
*
* Subject to terms and conditions in LICENSE.md.
*
*/

#import "GoogleMusicScriptCommand.h"
#import "RadiantPlayerScriptCommand.h"
#import "AppDelegate.h"

@implementation GoogleMusicScriptCommand
@implementation RadiantPlayerScriptCommand

/**
Called when supported AppleScript are executed
Expand Down
20 changes: 10 additions & 10 deletions google-music-mac/AppleScript/google-music-mac.sdef
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dictionary SYSTEM "file://localhost/System/Library/DTDs/sdef.dtd">
<dictionary title="Google Music Terminology">
<suite name="Google Music Suite" code="GMMs" description="The suite specific to Google Music for Mac">
<dictionary title="Radiant Player Terminology">
<suite name="Radiant Player Suite" code="GMMs" description="The suite specific to Radiant Player for Google Play Music">
<command name="back track" code="GMMsbatr" description="reposition to beginning of current track or go to previous track if already at start of current track">
<cocoa class="GoogleMusicScriptCommand"/>
<cocoa class="RadiantPlayerScriptCommand"/>
</command>
<command name="next track" code="GMMsnetr" description="advance to the next track in the current playlist">
<cocoa class="GoogleMusicScriptCommand"/>
<cocoa class="RadiantPlayerScriptCommand"/>
</command>
<command name="playpause" code="GMMsplpa" description="toggle the playing/paused state of the current track">
<cocoa class="GoogleMusicScriptCommand"/>
<cocoa class="RadiantPlayerScriptCommand"/>
</command>
<command name="toggle thumbs up" code="GMMsthup" description="toggle thumbs up for current track">
<cocoa class="GoogleMusicScriptCommand"/>
<cocoa class="RadiantPlayerScriptCommand"/>
</command>
<command name="toggle thumbs down" code="GMMsthdw" description="toggle thumbs down for current track">
<cocoa class="GoogleMusicScriptCommand"/>
<cocoa class="RadiantPlayerScriptCommand"/>
</command>
<command name="toggle shuffle" code="GMMsshfl" description="toggle shuffle on/off">
<cocoa class="GoogleMusicScriptCommand"/>
<cocoa class="RadiantPlayerScriptCommand"/>
</command>
<command name="toggle repeatmode" code="GMMsrpmo" description="toggle repeat mode">
<cocoa class="GoogleMusicScriptCommand"/>
<cocoa class="RadiantPlayerScriptCommand"/>
</command>
<command name="toggle visualization" code="GMMsvisl" description="toggle visualization on/off">
<cocoa class="GoogleMusicScriptCommand"/>
<cocoa class="RadiantPlayerScriptCommand"/>
</command>
</suite>
</dictionary>
Loading

0 comments on commit 7e238b5

Please sign in to comment.