Remove unused
This commit is contained in:
parent
1a9e0a4ef0
commit
08e7727644
|
@ -1,63 +0,0 @@
|
|||
/*
|
||||
This file is part of Subsonic.
|
||||
|
||||
Subsonic is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Subsonic is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Copyright 2009 (C) Sindre Mehus
|
||||
*/
|
||||
package net.nullsum.audinaut.domain;
|
||||
|
||||
/**
|
||||
* @author Sindre Mehus
|
||||
* @version $Id$
|
||||
*/
|
||||
public class RemoteStatus {
|
||||
|
||||
private Integer positionSeconds;
|
||||
private Integer currentPlayingIndex;
|
||||
private Float gain;
|
||||
private boolean playing;
|
||||
|
||||
public Integer getPositionSeconds() {
|
||||
return positionSeconds;
|
||||
}
|
||||
|
||||
public void setPositionSeconds(Integer positionSeconds) {
|
||||
this.positionSeconds = positionSeconds;
|
||||
}
|
||||
|
||||
public Integer getCurrentPlayingIndex() {
|
||||
return currentPlayingIndex;
|
||||
}
|
||||
|
||||
public void setCurrentIndex(Integer currentPlayingIndex) {
|
||||
this.currentPlayingIndex = currentPlayingIndex;
|
||||
}
|
||||
|
||||
public boolean isPlaying() {
|
||||
return playing;
|
||||
}
|
||||
|
||||
public void setPlaying(boolean playing) {
|
||||
this.playing = playing;
|
||||
}
|
||||
|
||||
public Float getGain() {
|
||||
return gain;
|
||||
}
|
||||
|
||||
public void setGain(float gain) {
|
||||
this.gain = gain;
|
||||
}
|
||||
}
|
|
@ -1,187 +0,0 @@
|
|||
/*
|
||||
This file is part of Subsonic.
|
||||
|
||||
Subsonic is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Subsonic is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Copyright 2009 (C) Sindre Mehus
|
||||
*/
|
||||
package net.nullsum.audinaut.domain;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* Represents the version number of the Subsonic Android app.
|
||||
*
|
||||
* @author Sindre Mehus
|
||||
* @version $Revision: 1.3 $ $Date: 2006/01/20 21:25:16 $
|
||||
*/
|
||||
public class Version implements Comparable<Version>, Serializable {
|
||||
private int major;
|
||||
private int minor;
|
||||
private int beta;
|
||||
private int bugfix;
|
||||
|
||||
public Version() {
|
||||
// For Kryo
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new version instance by parsing the given string.
|
||||
* @param version A string of the format "1.27", "1.27.2" or "1.27.beta3".
|
||||
*/
|
||||
public Version(String version) {
|
||||
String[] s = version.split("\\.");
|
||||
major = Integer.valueOf(s[0]);
|
||||
minor = Integer.valueOf(s[1]);
|
||||
|
||||
if (s.length > 2) {
|
||||
if (s[2].contains("beta")) {
|
||||
beta = Integer.valueOf(s[2].replace("beta", ""));
|
||||
} else {
|
||||
bugfix = Integer.valueOf(s[2]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public int getMajor() {
|
||||
return major;
|
||||
}
|
||||
|
||||
public int getMinor() {
|
||||
return minor;
|
||||
}
|
||||
|
||||
public String getVersion() {
|
||||
switch(major) {
|
||||
case 1:
|
||||
switch(minor) {
|
||||
case 0:
|
||||
return "3.8";
|
||||
case 1:
|
||||
return "3.9";
|
||||
case 2:
|
||||
return "4.0";
|
||||
case 3:
|
||||
return "4.1";
|
||||
case 4:
|
||||
return "4.2";
|
||||
case 5:
|
||||
return "4.3.1";
|
||||
case 6:
|
||||
return "4.5";
|
||||
case 7:
|
||||
return "4.6";
|
||||
case 8:
|
||||
return "4.7";
|
||||
case 9:
|
||||
return "4.8";
|
||||
case 10:
|
||||
return "4.9";
|
||||
case 11:
|
||||
return "5.1";
|
||||
case 12:
|
||||
return "5.2";
|
||||
case 13:
|
||||
return "5.3";
|
||||
case 14:
|
||||
return "6.0";
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
/**
|
||||
* Return whether this object is equal to another.
|
||||
* @param o Object to compare to.
|
||||
* @return Whether this object is equals to another.
|
||||
*/
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
|
||||
final Version version = (Version) o;
|
||||
|
||||
if (beta != version.beta) return false;
|
||||
if (bugfix != version.bugfix) return false;
|
||||
if (major != version.major) return false;
|
||||
return minor == version.minor;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a hash code for this object.
|
||||
* @return A hash code for this object.
|
||||
*/
|
||||
public int hashCode() {
|
||||
int result;
|
||||
result = major;
|
||||
result = 29 * result + minor;
|
||||
result = 29 * result + beta;
|
||||
result = 29 * result + bugfix;
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a string representation of the form "1.27", "1.27.2" or "1.27.beta3".
|
||||
* @return A string representation of the form "1.27", "1.27.2" or "1.27.beta3".
|
||||
*/
|
||||
public String toString() {
|
||||
StringBuffer buf = new StringBuffer();
|
||||
buf.append(major).append('.').append(minor);
|
||||
if (beta != 0) {
|
||||
buf.append(".beta").append(beta);
|
||||
} else if (bugfix != 0) {
|
||||
buf.append('.').append(bugfix);
|
||||
}
|
||||
|
||||
return buf.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Compares this object with the specified object for order.
|
||||
* @param version The object to compare to.
|
||||
* @return A negative integer, zero, or a positive integer as this object is less than, equal to, or
|
||||
* greater than the specified object.
|
||||
*/
|
||||
@Override
|
||||
public int compareTo(Version version) {
|
||||
if (major < version.major) {
|
||||
return -1;
|
||||
} else if (major > version.major) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (minor < version.minor) {
|
||||
return -1;
|
||||
} else if (minor > version.minor) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (bugfix < version.bugfix) {
|
||||
return -1;
|
||||
} else if (bugfix > version.bugfix) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
int thisBeta = beta == 0 ? Integer.MAX_VALUE : beta;
|
||||
int otherBeta = version.beta == 0 ? Integer.MAX_VALUE : version.beta;
|
||||
|
||||
if (thisBeta < otherBeta) {
|
||||
return -1;
|
||||
} else if (thisBeta > otherBeta) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
|
@ -37,7 +37,6 @@ import net.nullsum.audinaut.domain.Artist;
|
|||
import net.nullsum.audinaut.domain.Genre;
|
||||
import net.nullsum.audinaut.domain.Indexes;
|
||||
import net.nullsum.audinaut.domain.PlayerQueue;
|
||||
import net.nullsum.audinaut.domain.RemoteStatus;
|
||||
import net.nullsum.audinaut.domain.MusicDirectory;
|
||||
import net.nullsum.audinaut.domain.MusicFolder;
|
||||
import net.nullsum.audinaut.domain.Playlist;
|
||||
|
|
|
@ -28,14 +28,12 @@ import android.graphics.Bitmap;
|
|||
import net.nullsum.audinaut.domain.Genre;
|
||||
import net.nullsum.audinaut.domain.Indexes;
|
||||
import net.nullsum.audinaut.domain.PlayerQueue;
|
||||
import net.nullsum.audinaut.domain.RemoteStatus;
|
||||
import net.nullsum.audinaut.domain.MusicDirectory;
|
||||
import net.nullsum.audinaut.domain.MusicFolder;
|
||||
import net.nullsum.audinaut.domain.Playlist;
|
||||
import net.nullsum.audinaut.domain.SearchCritera;
|
||||
import net.nullsum.audinaut.domain.SearchResult;
|
||||
import net.nullsum.audinaut.domain.User;
|
||||
import net.nullsum.audinaut.domain.Version;
|
||||
import net.nullsum.audinaut.util.SilentBackgroundTask;
|
||||
import net.nullsum.audinaut.util.ProgressListener;
|
||||
|
||||
|
|
|
@ -41,7 +41,6 @@ import net.nullsum.audinaut.domain.Genre;
|
|||
import net.nullsum.audinaut.domain.Indexes;
|
||||
import net.nullsum.audinaut.domain.MusicDirectory.Entry;
|
||||
import net.nullsum.audinaut.domain.PlayerQueue;
|
||||
import net.nullsum.audinaut.domain.RemoteStatus;
|
||||
import net.nullsum.audinaut.domain.MusicDirectory;
|
||||
import net.nullsum.audinaut.domain.MusicFolder;
|
||||
import net.nullsum.audinaut.domain.Playlist;
|
||||
|
|
|
@ -27,7 +27,6 @@ import android.content.Context;
|
|||
import android.util.Log;
|
||||
import android.util.Xml;
|
||||
import net.nullsum.audinaut.R;
|
||||
import net.nullsum.audinaut.domain.Version;
|
||||
import net.nullsum.audinaut.util.ProgressListener;
|
||||
import net.nullsum.audinaut.util.Util;
|
||||
|
||||
|
|
Loading…
Reference in New Issue