Skip to content

Commit

Permalink
Update Music Player Support to 0.3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
RangerCD committed Mar 7, 2016
1 parent 002c789 commit 9dc7398
Show file tree
Hide file tree
Showing 19 changed files with 289 additions and 10 deletions.
16 changes: 16 additions & 0 deletions object/RangerCD/OMusicPlayerDataSource.h
Expand Up @@ -45,6 +45,9 @@ namespace RangerCD {
/// - Kugou Music
/// - Data UID: RangerCD::MusicPlayer::ID_KUGOU
/// - Data Values: RangerCD::MusicPlayer::Kugou::VALUE
/// - TT Player
/// - Data UID: RangerCD::MusicPlayer::ID_TT
/// - Data Values: RangerCD::MusicPlayer::TTPlayer::VALUE
///
/// All of the value types are fixed and indicated by the prefix of their IDs.
///
Expand Down Expand Up @@ -134,13 +137,26 @@ enum VALUE {

} // Kugou

/// \declns{RangerCD::MusicPlayer::TTPlayer}
namespace TTPlayer {

/// \brief TT Player value IDs.
enum VALUE {
STR_INFO,
STR_CUSTOM,
};


} // TTPlayer


NVG_DEFINE_UID(ID_UNI, 0x64f23bc6, 0xcdf7, 0x4cbb, 0xb1, 0xcd, 0xee, 0xdd, 0xf3, 0x92, 0xfd, 0x21); ///< 64F23BC6-CDF7-4cbb-B1CD-EEDDF392FD21
NVG_DEFINE_UID(ID_CAD, 0x26ddf5cf, 0x528b, 0x46b4, 0xb1, 0x84, 0x19, 0xed, 0x77, 0x1d, 0x49, 0x5d); ///< 26DDF5CF-528B-46b4-B184-19ED771D495D
NVG_DEFINE_UID(ID_NETEASE, 0x80b56631, 0x8172, 0x45e8, 0xab, 0x34, 0x64, 0xb3, 0xd2, 0x70, 0xda, 0xd6); ///< 80B56631-8172-45e8-AB34-64B3D270DAD6
NVG_DEFINE_UID(ID_XIAMI, 0x0a14d6b5, 0x76f8, 0x428b, 0xa9, 0xce, 0x50, 0x53, 0x1d, 0x96, 0x97, 0xd4); ///< 0A14D6B5-76F8-428b-A9CE-50531D9697D4
NVG_DEFINE_UID(ID_QQMUSIC, 0x0450128c, 0x1180, 0x4f65, 0x91, 0x82, 0xd9, 0x1c, 0x7a, 0x33, 0x7c, 0x51); ///< 0450128C-1180-4f65-9182-D91C7A337C51
NVG_DEFINE_UID(ID_KUGOU, 0x0942461a, 0xe21c, 0x4ac1, 0xa4, 0x1d, 0x25, 0x66, 0x8f, 0x29, 0x44, 0xdd); ///< 0942461A-E21C-4ac1-A41D-25668F2944DD
NVG_DEFINE_UID(ID_TT, 0x67b247ba, 0x8f69, 0x4680, 0x84, 0xd7, 0xc1, 0x01, 0x90, 0x3f, 0xf4, 0x6e); ///< 67B247BA-8F69-4680-84D7-C101903FF46E

} // MusicPlayer

Expand Down
Binary file modified plugin/Music Player Support/bin/Locales/zh_CN.mo
Binary file not shown.
Binary file modified plugin/Music Player Support/bin/module32.dll
Binary file not shown.
Binary file modified plugin/Music Player Support/bin/module64.dll
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions plugin/Music Player Support/bin/widget/cover demo/cover.js
@@ -0,0 +1,42 @@
var DATA_URL = "http://nvg-data/";
var ID_ODATASOURCE = "A60D2B8A-DCD9-4753-9E3F-C9F2B686F34B";
var ID_DATA_CAD = "26DDF5CF-528B-46b4-B184-19ED771D495D";
var ID_CAD_TITLE = 3;
var ID_CAD_COVER = 7;

var UPDATE_INTERVAL = 1000; // 1s

var title = "";

function updateItem(sid, did, vid, isCover)
{
$.ajax({
type: "get",
dataType: "json",
url: DATA_URL + sid + "/" + did + "/" + vid + "/query",
success: function (ret) {
if (isCover) {
if (ret.data.value != " ")
document.getElementById("cover").src = ret.data.value + "?time=" + new Date().getTime();
else
document.getElementById("cover").src = "unknown.png";
}
else
if (ret.data.value != title) {
title = ret.data.value;
document.getElementById("cover").src = "";
updateItem(ID_ODATASOURCE, ID_DATA_CAD, ID_CAD_COVER, true);
}
}
});
}

function refreshValues()
{
updateItem(ID_ODATASOURCE, ID_DATA_CAD, ID_CAD_TITLE, false);
}

$(function () {
refreshValues();
setInterval("refreshValues()", UPDATE_INTERVAL);
});
123 changes: 123 additions & 0 deletions plugin/Music Player Support/bin/widget/cover demo/index.html
@@ -0,0 +1,123 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Cover Demo</title>
<script language="javascript" type="text/javascript" src="jquery.min.js"></script>
<script language="javascript" type="text/javascript" src="cover.js"></script>
<style>
.grid {
position: absolute;
}

.l-t {
height: 10px;
width: 10px;
top: 0px;
left: 0px;
background-image: url("left-top.png");
}

.t {
height: 10px;
width: auto;
top: 0px;
left: 10px;
right: 10px;
background-image: url("top.png");
}

.r-t {
height: 10px;
width: 10px;
top: 0px;
right: 0px;
background-image: url("right-top.png");
}

.l {
height: auto;
width: 10px;
top: 10px;
left: 0px;
bottom: 10px;
background-image: url("left.png");
}

.r {
height: auto;
width: 10px;
top: 10px;
bottom: 10px;
right: 0px;
background-image: url("right.png");
}

.l-b {
height: 10px;
width: 10px;
left: 0px;
bottom: 0px;
background-image: url("left-bottom.png");
}

.b {
height: 10px;
width: auto;
left: 10px;
bottom: 0px;
right: 10px;
background-image: url("bottom.png");
}

.r-b {
height: 10px;
width: 10px;
bottom: 0px;
right: 0px;
background-image: url("right-bottom.png");
}

.bg {
width: auto;
height: auto;
top: 10px;
left: 10px;
bottom: 10px;
right: 10px;
background-image: url("bg.png");
}

.cover {
margin: auto;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
max-height: 100%;
max-width: 100%;
}
</style>
</head>

<body>
<div>
<div class="grid l-t"></div>
<div class="grid t"></div>
<div class="grid r-t"></div>
</div>
<div>
<div class="grid l"></div>
<div class="grid bg">
<img class="cover" id="cover" src="" onerror='this.src="unknown.png"'/>
</div>
<div class="grid r"></div>
</div>
<div>
<div class="grid l-b"></div>
<div class="grid b"></div>
<div class="grid r-b"></div>
</div>
</body>
</html>

Large diffs are not rendered by default.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
94 changes: 94 additions & 0 deletions plugin/Music Player Support/bin/widget/cover demo/style.css
@@ -0,0 +1,94 @@

.item {
font-family: 微软雅黑;
width: auto;
min-height: 24px;
color: #FFF;
background: rgba(0,0,0,0.5);
padding: 0 4px 0 4px;
line-height: 140%;
overflow: hidden;
white-space: nowrap;
}

.square {
float: left;
height: 50px;
width: 44px;
text-align: center;
line-height: 300%;
background: rgba(99,99,99,0.5);
}

.line {
margin-bottom: 2px;
}

.v-layout {
width: auto;
margin-left: 54px;
}


.progress {
height: 16px;
margin-top: 4px;
color: #333;
background: #EEE;
border-right: 2px solid #999;
text-align: center;
line-height: 100%;
}

.head .left {
margin-right: 54px;
}

.head .right {
float: right;
width: 44px;
}

.main .left {
float: left;
width: 44px;
}

.main .right {
width: auto;
}

.extra .left {
margin-right: 22px;
overflow: auto;
white-space: normal;
}

.extra .right {
float: right;
width: 20px;
padding: 0px;
text-align: center;
cursor: default;
}

.extra .right:hover {
background: rgba(99,99,99,0.5);
}

#note textarea {
margin: 1px -4px 1px -3px;
width: 100%;
height: 100%;
resize: none;
overflow-y: hidden;
}

#note pre {
margin: 0px;
word-wrap: break-word;
}

.clear {
clear: both;
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions plugin/Music Player Support/update.xml
Expand Up @@ -5,8 +5,8 @@
<zh_CHS>音乐播放器支持</zh_CHS>
</name>
<id>2DF313A1-E3D0-4196-A0B3-03ADF7F12316</id>
<version>0.2.0.0</version>
<date>2015.12.06</date>
<version>0.3.0.0</version>
<date>2016.03.07</date>
<url>
<en>http://www.debug.moe/sao/music-player-sp-page</en>
<zh_CHS>http://www.debug.moe/sao/music-player-sp-page</zh_CHS>
Expand All @@ -15,23 +15,23 @@
<note>
<en>
<![CDATA[ ***** Music Player Support Update Details *****
Version: 0.2.0
Date: 2015.12.06
Version: 0.3.0
Date: 2016.03.07
Supports CAD compatible players, NetEase Cloud Music, Xiami Music, QQ Music, Kugou Music.
Add scrolling mode, solve the long text display problem.
Supports CAD compatible players, NetEase Cloud Music, Xiami Music, QQ Music, Kugou Music, TT Player(old version).
Add Foobar2000 cover support, TTPlayer (old version) support.
[ Links ]
Homepage: http://www.debug.moe
]]>
</en>
<zh_CHS>
<![CDATA[ ***** <音乐播放器支持> 更新详情 *****
版本: 0.2.0
日期: 2015.12.06
版本: 0.3.0
日期: 2016.03.07
现已支持CAD兼容播放器、网易云音乐、虾米音乐、QQ音乐、酷狗音乐。
新增滚动模式,解决文字过长问题
现已支持CAD兼容播放器、网易云音乐、虾米音乐、QQ音乐、酷狗音乐、千千静听(老版)
新增Foobar2000封面支持,千千静听(老版)支持
[ 链接 ]
首頁: http://www.debug.moe
Expand Down

0 comments on commit 9dc7398

Please sign in to comment.