[tuxdroid-svn] r4581 - in software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdr
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r4581 - in software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV: resources src/com/kysoh/tvPrograms/gadget src/com/kysoh/tvPrograms/programs
|
From: jerome <c2m...@c2...> - 2009-04-24 07:37:49
|
Author: jerome
Date: 2009-04-24 09:37:41 +0200 (Fri, 24 Apr 2009)
New Revision: 4581
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/gadget.pot
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/FrenchConfiguration.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
Log:
* Filter out program in case of frame time doesn't match with the system time.
Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/gadget.pot
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/gadget.pot 2009-04-23 11:50:31 UTC (rev 4580)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/gadget.pot 2009-04-24 07:37:41 UTC (rev 4581)
@@ -61,7 +61,7 @@
msgid "Evening"
msgstr ""
-msgid "Give current played program"
+msgid "Give currently playing program"
msgstr ""
msgid "Give the tv program"
Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java 2009-04-23 11:50:31 UTC (rev 4580)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java 2009-04-24 07:37:41 UTC (rev 4581)
@@ -25,7 +25,7 @@
public class Configuration extends SimpleGadgetConfiguration{
- private String channel = "Eén";
+ private String channel = "VTM";
private boolean giveProgramDescription = true;
private boolean giveMorning = false;
private boolean giveAfternoon = false;
Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/FrenchConfiguration.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/FrenchConfiguration.java 2009-04-23 11:50:31 UTC (rev 4580)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/FrenchConfiguration.java 2009-04-24 07:37:41 UTC (rev 4581)
@@ -33,7 +33,7 @@
private boolean giveMorning = false;
private boolean giveAfternoon = false;
private boolean giveEvening = false;
- private boolean giveNowPlaying = false;
+ private boolean giveNowPlaying = true;
private String tHour = "Morning";
Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java 2009-04-23 11:50:31 UTC (rev 4580)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java 2009-04-24 07:37:41 UTC (rev 4581)
@@ -43,6 +43,14 @@
if(nowPlaying != null)
{
gadget.throwMessage("Now playing on {0}, {1}", nowPlaying.getChannel(), nowPlaying.getTitle());
+
+ Program nextPlaying = SimplePrograms.getNextPlaying(programme, nowPlaying);
+
+ if(nextPlaying != null)
+ {
+ gadget.throwMessage("Next playing {0} at {1}", nextPlaying.getTitle(), nextPlaying.getStartTime());
+ }
+
}
else
{
Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java 2009-04-23 11:50:31 UTC (rev 4580)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java 2009-04-24 07:37:41 UTC (rev 4581)
@@ -114,6 +114,13 @@
if(nowPlaying != null)
{
throwMessage("Now playing on {0}, {1}", nowPlaying.getChannel(), nowPlaying.getTitle());
+
+ Program nextPlaying = SimplePrograms.getNextPlaying(programme, nowPlaying);
+
+ if(nextPlaying != null)
+ {
+ throwMessage("Next playing {0} at {1}", nextPlaying.getTitle(), nextPlaying.getStartTime());
+ }
}
else
{
Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java 2009-04-23 11:50:31 UTC (rev 4580)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java 2009-04-24 07:37:41 UTC (rev 4581)
@@ -510,7 +510,22 @@
*/
public static Vector<Program> sortMorning(Vector<Program> program)
{
- return SimplePrograms.sortPrograms(program, SimplePrograms.MORNING);
+ Vector<Program> progr = new Vector<Program>();
+ Vector<Program> programme = SimplePrograms.sortPrograms(program, SimplePrograms.MORNING);
+
+ int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+
+ for(Program p : programme)
+ {
+ int pHour = Integer.valueOf(p.getStartTime().substring(0, 2)).intValue();
+
+ if(pHour >= hour)
+ {
+ progr.add(p);
+ }
+ }
+
+ return progr;
}
@@ -521,7 +536,23 @@
*/
public static Vector<Program> sortAfternoon(Vector<Program> program)
{
- return SimplePrograms.sortPrograms(program, SimplePrograms.AFTERNOON);
+ Vector<Program> progr = new Vector<Program>();
+
+ Vector<Program> programme = SimplePrograms.sortPrograms(program, SimplePrograms.AFTERNOON);
+
+ int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+
+ for(Program p : programme)
+ {
+ int pHour = Integer.valueOf(p.getStartTime().substring(0, 2)).intValue();
+
+ if(pHour >= hour)
+ {
+ progr.add(p);
+ }
+ }
+
+ return progr;
}
@@ -532,7 +563,22 @@
*/
public static Vector<Program> sortEvening(Vector<Program> program)
{
- return SimplePrograms.sortPrograms(program, SimplePrograms.EVENING);
+ Vector<Program> progr = new Vector<Program>();
+ Vector<Program> programme = SimplePrograms.sortPrograms(program, SimplePrograms.EVENING);
+
+ int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+
+ for(Program p : programme)
+ {
+ int pHour = Integer.valueOf(p.getStartTime().substring(0, 2)).intValue();
+
+ if(pHour >= hour)
+ {
+ progr.add(p);
+ }
+ }
+
+ return progr;
}
@@ -599,6 +645,33 @@
/**
+ * Give the next playing program.
+ * @return
+ */
+ public static Program getNextPlaying(Vector<Program> program, Program nowPlaying)
+ {
+ int npIndex = program.indexOf(nowPlaying);
+
+ if( (npIndex != -1) && (program.size() - 1 >= npIndex) )
+ {
+ Program next = null;
+
+ try
+ {
+ next = program.get( npIndex + 1 );
+ return next;
+ }
+ catch(Exception error)
+ {
+ return null;
+ }
+ }
+ else
+ return null;
+ }
+
+
+ /**
* Check backward for matching program.
* @param hour
* @return
|
