Helix Player Home > Helix Player Development > Helix Player Plans @@ -22,41 +25,51 @@ +
+Helix Player Plans
+-Balto is the codename for the next version of the Helix Player, due out -in Q4 of 2005.
+Balto is the codename for the next version of the Helix Player currently under development. +Download a nightly build to test out the features as they become available.
+Bingo is the codename for the currently shipping Helix Player 1.0. We recently -released an update (10.0.4) which addresses some security +released an update (10.0.6) which addresses some security vulnerabilities. Bingo is in maintainance mode, and we aren't planning any new releases of @@ -218,39 +270,49 @@ +
hxclient_1_4_4_neptunex
Copyright assignment:
1. In consideration for RealNetworks' hosting and maintenance of my modification, I agree to assign to RealNetworks full
copyright ownership of the code included in the attached
patch, and agree that RealNetworks has no duty of accounting
to me for it. I warrant that this code is entirely original
to and owned by me, that I can legally grant the copyright
assignment, and that my contribution does not violate any other
person's rights, and laws or breach any contract. I understand
that RealNetworks may license this code under RPSL, RCSL, and/or any other license at RealNetworks' discretion, and use
the code in any way.
2. I have signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the agreement was received.
3. My company (company name here) submits this code under the terms
of a commercial contribution agreement with RealNetworks,
and I am authorized to contribute this code under said agreement.
4. I am a RealNetworks employee or contractor
QA Instructions:
Index: README.realplay.in
===================================================================
RCS file: /cvsroot/player/app/gtk/README.realplay.in,v
retrieving revision 1.1.2.8.4.1
retrieving revision 1.1.2.8.4.2
diff -u -d -r1.1.2.8.4.1 -r1.1.2.8.4.2
--- README.realplay.in 23 Jan 2006 04:19:49 -0000 1.1.2.8.4.1
+++ README.realplay.in 21 Feb 2006 02:16:39 -0000 1.1.2.8.4.2
@@ -3,7 +3,7 @@
Release Notes
- February 2005
+ February 2006
System Requirements
@@ -55,6 +55,11 @@
been moved so that WAV and PCM files now work.
* Chained Ogg support has been added.
* Some memory leaks have been fixed.
+ * Core dump when given illegal options after "-e"
+ or "-c" has been fixed.
+ * One known Xerror on Sparc has been fixed.
+ * The output of -h option has been changed from
+ 'hxplayer' to 'realplay'
Known Issues
@@ -107,6 +112,30 @@
Setting it to a single number
will result in a player crash.
+ * Multiple instances of Real Player
+ result in a hang of second instance
+ when you start up Realplayer from menu
+ or from command line.
+ You can use "-n" option to start up
+ multiple Players.
+ * If you click "General", "FAQ", etc. under
+ help menu you probably get error "Couldn't
+ display...", and then the file browser is
+ launched.
+ To solve this problem you can specify the
+ location of web browser in Realplayer
+ preference->General, Realplayer will launch
+ web browser instead of file browser and go
+ to the specified document on internet if you
+ already set the proxy.
+ * Garble messages displayed when executing
+ realplay ?-help in gnome-terminal with
+ zh_CN/zh_TW/ja locale.
+ To solve this problem, use UTF-8 locale
+ instead in gnome-terminal.
+ * Licence is only available in English currently.
+ * Realplayer for Solaris has been given the L10N waiver
+ for Swedish.
Technical Support
@@ -117,7 +146,7 @@
To reach the development team please
send email to
- users@player.helixcommunity.org.
+ sun-realplayer@Sun.COM.
You can check the player help page in
the Helix Player project:
From jerrytansun at helixcommunity.org Wed Feb 22 18:34:37 2006
From: jerrytansun at helixcommunity.org (jerrytansun@helixcommunity.org)
Date: Wed Feb 22 20:44:59 2006
Subject: [Player-cvs] installer/srv4 Umakefil,1.1.2.6,1.1.2.6.2.1
Message-ID:
Update of /cvsroot/player/installer/srv4
In directory cvs:/tmp/cvs-serv11915
Modified Files:
Tag: hxclient_1_4_4_neptunex
Umakefil
Log Message:
bug = 4811
patch by jerry.tan
reviewed by Eric Hyche
fix some postinstall script error in solaris srv4 package on helixcommunity.org
Index: Umakefil
===================================================================
RCS file: /cvsroot/player/installer/srv4/Umakefil,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.6.2.1
diff -u -d -r1.1.2.6 -r1.1.2.6.2.1
--- Umakefil 2 Apr 2005 01:38:02 -0000 1.1.2.6
+++ Umakefil 23 Feb 2006 02:34:35 -0000 1.1.2.6.2.1
@@ -124,10 +124,6 @@
"\tcp -R ../archive/temp/* %s\n" % work_dir,
# don't use the Bin dir, which only contains the installer's setup program
"\trm -rf %s/%s\n" % (work_dir, "Bin"),
- # create bin dir, move player program/script into it
- "\ttest -d %s/bin || mkdir %s/bin\n" % (work_dir, work_dir),
- "\tmv %s/%s %s/bin\n" % (work_dir, var_map["__SHORT_NAME"], work_dir),
- "\tmv %s/%s.bin %s/bin\n" % (work_dir, var_map["__SHORT_NAME"], work_dir),
# make the package
"package: stage\n",
From jerrytansun at helixcommunity.org Wed Feb 22 18:34:38 2006
From: jerrytansun at helixcommunity.org (jerrytansun@helixcommunity.org)
Date: Wed Feb 22 20:44:59 2006
Subject: [Player-cvs] installer/srv4/devel prototype.in, 1.1.2.1,
1.1.2.1.2.1 postinstall.in, 1.1.2.1, 1.1.2.1.2.1
Message-ID:
Update of /cvsroot/player/installer/srv4/devel
In directory cvs:/tmp/cvs-serv11915/devel
Modified Files:
Tag: hxclient_1_4_4_neptunex
prototype.in postinstall.in
Log Message:
bug = 4811
patch by jerry.tan
reviewed by Eric Hyche
fix some postinstall script error in solaris srv4 package on helixcommunity.org
Index: prototype.in
===================================================================
RCS file: /cvsroot/player/installer/srv4/devel/Attic/prototype.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -d -r1.1.2.1 -r1.1.2.1.2.1
--- prototype.in 2 Apr 2005 00:42:13 -0000 1.1.2.1
+++ prototype.in 23 Feb 2006 02:34:35 -0000 1.1.2.1.2.1
@@ -21,10 +21,8 @@
d none local/__LONG_NAME 0755 root bin
f none local/__LONG_NAME/README
f none local/__LONG_NAME/LICENSE
-
-d none local/__LONG_NAME/bin 0755 root bin
-f none local/__LONG_NAME/bin/__SHORT_NAME.bin 0555 root bin
-f none local/__LONG_NAME/bin/__SHORT_NAME 0555 root bin
+f none local/__LONG_NAME/__SHORT_NAME.bin 0555 root bin
+f none local/__LONG_NAME/__SHORT_NAME 0555 root bin
d none local/__LONG_NAME/common 0755 root bin
f none local/__LONG_NAME/common/clntcore.so
Index: postinstall.in
===================================================================
RCS file: /cvsroot/player/installer/srv4/devel/Attic/postinstall.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -d -r1.1.2.1 -r1.1.2.1.2.1
--- postinstall.in 2 Apr 2005 00:42:13 -0000 1.1.2.1
+++ postinstall.in 23 Feb 2006 02:34:35 -0000 1.1.2.1.2.1
@@ -137,11 +137,13 @@
for LANGUAGE in `ls $INSTDIR/share/locale` ; do
if [ -f $INSTDIR/share/locale/$LANGUAGE/player.mo ] ; then
rm -f "$LOCALEPATH/$LANGUAGE/LC_MESSAGES/$TARGET.mo"
- install -m 644 "$INSTDIR/share/locale/$LANGUAGE/player.mo" "$LOCALEPATH/$LANGUAGE/LC_MESSAGES/$TARGET.mo"
+ cp "$INSTDIR/share/locale/$LANGUAGE/player.mo" "$LOCALEPATH/$LANGUAGE/LC_MESSAGES/$TARGET.mo"
+ chmod 644 $LOCALEPATH/$LANGUAGE/LC_MESSAGES/$TARGET.mo
fi
if [ -f $INSTDIR/share/locale/$LANGUAGE/widget.mo ] ; then
rm -f "$LOCALEPATH/$LANGUAGE/LC_MESSAGES/libgtkhx.mo"
- install -m 644 "$INSTDIR/share/locale/$LANGUAGE/widget.mo" "$LOCALEPATH/$LANGUAGE/LC_MESSAGES/libgtkhx.mo"
+ cp "$INSTDIR/share/locale/$LANGUAGE/widget.mo" "$LOCALEPATH/$LANGUAGE/LC_MESSAGES/libgtkhx.mo"
+ chmod 644 $LOCALEPATH/$LANGUAGE/LC_MESSAGES/libgtkhx.mo
fi
done
fi
@@ -176,8 +178,8 @@
(
cd $INSTDIR ;
EXPR="s%#[ \t]*HELIX_LIBS[ \t]*=.*$%HELIX_LIBS=`pwd` ; export HELIX_LIBS%"
- cp bin/$TARGET bin/$TARGET.bak
- sed -e "$EXPR" bin/$TARGET.bak > bin/$TARGET
+ cp $TARGET $TARGET.bak
+ sed -e "$EXPR" $TARGET.bak > $TARGET
)
# check the display.
From cdunn at helixcommunity.org Wed Feb 22 19:14:08 2006
From: cdunn at helixcommunity.org (cdunn@helixcommunity.org)
Date: Wed Feb 22 21:24:30 2006
Subject: [Player-cvs] kit/jsr135 hxsimpleringbuf.cpp, NONE,
1.1 DataSourceCallback.cpp, 1.1, 1.2 Umakefil, 1.7,
1.8 manager.cpp, 1.6, 1.7 manager_wrap.cpp, 1.10, 1.11 mmapi.i,
1.8, 1.9 myplay.java, 1.11, 1.12 player.cpp, 1.10, 1.11
Message-ID:
Update of /cvsroot/player/kit/jsr135
In directory cvs:/tmp/cvs-serv32268
Modified Files:
DataSourceCallback.cpp Umakefil manager.cpp manager_wrap.cpp
mmapi.i myplay.java player.cpp
Added Files:
hxsimpleringbuf.cpp
Log Message:
Update..
Index: mmapi.i
===================================================================
RCS file: /cvsroot/player/kit/jsr135/mmapi.i,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mmapi.i 15 Feb 2006 20:00:53 -0000 1.8
+++ mmapi.i 23 Feb 2006 03:14:05 -0000 1.9
@@ -20,6 +20,21 @@
%include "various.i"
%apply char **STRING_ARRAY { char ** };
+%typemap(jni) unsigned char* BYTE "jbyteArray"
+%typemap(jtype) unsigned char* BYTE "byte[]"
+%typemap(jstype) unsigned char* BYTE "byte[]"
+%typemap(in) unsigned char* BYTE {
+ $1 = (unsigned char* ) JCALL2(GetByteArrayElements, jenv, $input, 0);
+}
+%typemap(argout) unsigned char* BYTE {
+ JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *) $1, 0);
+}
+%typemap(javain) unsigned char* BYTE "$javainput"
+%typemap(freearg) unsigned char* BYTE ""
+
+%apply unsigned char* BYTE { unsigned char* };
+
+
%javaexception("javax.microedition.media.MediaException") createPlayer {
try {
$action
Index: manager_wrap.cpp
===================================================================
RCS file: /cvsroot/player/kit/jsr135/manager_wrap.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- manager_wrap.cpp 15 Feb 2006 20:00:53 -0000 1.10
+++ manager_wrap.cpp 23 Feb 2006 03:14:05 -0000 1.11
@@ -812,6 +812,57 @@
}
+JNIEXPORT jboolean JNICALL Java_javax_microedition_media_mmapiJNI__1Player_1IsRingBufferFull(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+ jboolean jresult = 0 ;
+ _Player *arg1 = (_Player *) 0 ;
+ bool result;
+
+ (void)jenv;
+ (void)jcls;
+ arg1 = *(_Player **)(void *)&jarg1;
+ result = (bool)(arg1)->IsRingBufferFull();
+
+ jresult = (jboolean)result;
+ return jresult;
+}
+
+
+JNIEXPORT void JNICALL Java_javax_microedition_media_mmapiJNI__1Player_1storeData(JNIEnv *jenv, jclass jcls, jlong jarg1, jbyteArray jarg2, jint jarg3) {
+ _Player *arg1 = (_Player *) 0 ;
+ unsigned char *arg2 = (unsigned char *) 0 ;
+ int arg3 ;
+
+ (void)jenv;
+ (void)jcls;
+ arg1 = *(_Player **)(void *)&jarg1;
+ {
+ arg2 = (unsigned char* ) jenv->GetByteArrayElements(jarg2, 0);
+ }
+ arg3 = (int)jarg3;
+ (arg1)->storeData(arg2,arg3);
+
+ {
+ jenv->ReleaseByteArrayElements(jarg2, (jbyte *) arg2, 0);
+ }
+
+}
+
+
+JNIEXPORT jlong JNICALL Java_javax_microedition_media_mmapiJNI__1Player_1getRequest(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+ jlong jresult = 0 ;
+ _Player *arg1 = (_Player *) 0 ;
+ EDataSource result;
+
+ (void)jenv;
+ (void)jcls;
+ arg1 = *(_Player **)(void *)&jarg1;
+ result = (arg1)->getRequest();
+
+ *(EDataSource **)(void *)&jresult = new EDataSource((EDataSource &)result);
+ return jresult;
+}
+
+
JNIEXPORT jobjectArray JNICALL Java_javax_microedition_media_mmapiJNI__1Player_1getControls(JNIEnv *jenv, jclass jcls, jlong jarg1) {
jobjectArray jresult = 0 ;
_Player *arg1 = (_Player *) 0 ;
@@ -1186,8 +1237,8 @@
}
-JNIEXPORT jlong JNICALL Java_javax_microedition_media_mmapiJNI__1VideoControl_1getSnapshot(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {
- jlong jresult = 0 ;
+JNIEXPORT jbyteArray JNICALL Java_javax_microedition_media_mmapiJNI__1VideoControl_1getSnapshot(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {
+ jbyteArray jresult = 0 ;
_VideoControl *arg1 = (_VideoControl *) 0 ;
char *arg2 = (char *) 0 ;
unsigned char *result;
@@ -1478,16 +1529,22 @@
}
-JNIEXPORT void JNICALL Java_javax_microedition_media_mmapiJNI__1ToneControl_1setSequence(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {
+JNIEXPORT void JNICALL Java_javax_microedition_media_mmapiJNI__1ToneControl_1setSequence(JNIEnv *jenv, jclass jcls, jlong jarg1, jbyteArray jarg2) {
_ToneControl *arg1 = (_ToneControl *) 0 ;
unsigned char *arg2 = (unsigned char *) 0 ;
(void)jenv;
(void)jcls;
arg1 = *(_ToneControl **)(void *)&jarg1;
- arg2 = *(unsigned char **)(void *)&jarg2;
+ {
+ arg2 = (unsigned char* ) jenv->GetByteArrayElements(jarg2, 0);
+ }
(arg1)->setSequence(arg2);
+ {
+ jenv->ReleaseByteArrayElements(jarg2, (jbyte *) arg2, 0);
+ }
+
}
--- NEW FILE: hxsimpleringbuf.cpp ---
#include "hlxclib/stdio.h"
#include "hxresult.h"
#include "hxsimpleringbuf.h"
HXSimpleRingBuffer::HXSimpleRingBuffer(UINT32 uBufSize, UINT32 uReservedBytes)
: m_uBufSize(uBufSize)
, m_uReservedBytes(uReservedBytes)
, m_uNextGet(0)
, m_uNextPut(0)
, m_uReserveGet(0)
, m_bEmpty(TRUE)
{
m_pRingBuffer = (BYTE*) malloc(uBufSize * sizeof(BYTE));
}
HXSimpleRingBuffer::~HXSimpleRingBuffer()
{
HX_DELETE(m_pRingBuffer);
}
HXBOOL
HXSimpleRingBuffer::Put(const BYTE* buf, UINT32 uLen, HXBOOL bWithReserved/*=FALSE*/)
{
if (IsFull() || uLen > AvailablePutBytes(bWithReserved))
{
return FALSE;
}
if ((uLen + m_uNextPut) <= m_uBufSize)
{
// no ring
memcpy((m_pRingBuffer + m_uNextPut), buf, uLen);
}
else
{
// ring it
UINT32 uFirstChunkLen = (uLen - (m_uBufSize - m_uNextPut));
memcpy((m_pRingBuffer + m_uNextPut), buf, uFirstChunkLen);
memcpy(m_pRingBuffer, (buf + uFirstChunkLen), (uLen - uFirstChunkLen));
}
m_uNextPut = (m_uNextPut + uLen) % m_uBufSize;
m_bEmpty = FALSE;
return TRUE;
}
HXBOOL
HXSimpleRingBuffer::Get(BYTE* buf, UINT32& uLen, HXBOOL bWithReserved/*=FALSE*/)
{
HXBOOL status = TRUE;
UINT32 uAvailableGetBytes = AvailableGetBytes(bWithReserved);
if (uAvailableGetBytes < uLen)
{
uLen = uAvailableGetBytes;
status = FALSE;
}
UINT32 uCopyFrom = (bWithReserved) ? m_uReserveGet : m_uNextGet;
if ((uCopyFrom + uLen) <= m_uBufSize )
{
// no ring
memcpy(buf, (m_pRingBuffer + uCopyFrom), uLen);
m_uNextGet += uLen;
}
else
{
// ring
UINT32 uFirstChunkLen = (m_uBufSize - uCopyFrom);
memcpy(buf, (m_pRingBuffer + uCopyFrom), uFirstChunkLen);
memcpy((buf + uFirstChunkLen), m_pRingBuffer, uLen - uFirstChunkLen);
m_uNextGet = uLen - uFirstChunkLen;
}
m_bEmpty = (uLen == uAvailableGetBytes);
// Set the reserve position
UINT32 uValidLen;
uValidLen = MIN(m_uReservedBytes, (((m_uNextGet - m_uReserveGet) + m_uBufSize) % m_uBufSize));
m_uReserveGet = (((m_uNextGet - uValidLen) + m_uBufSize) % m_uBufSize);
return status;
}
UINT32
HXSimpleRingBuffer::AvailablePutBytes(HXBOOL bWithReserved/*=FALSE*/)
{
if (m_bEmpty)
{
return m_uBufSize;
}
UINT32 uEnd = (bWithReserved) ? m_uNextGet : m_uReserveGet;
return ((uEnd - m_uNextPut) + m_uBufSize) % m_uBufSize;
}
UINT32
HXSimpleRingBuffer::AvailableGetBytes(HXBOOL bWithReserved/*=FALSE*/)
{
if (m_bEmpty)
{
return 0;
}
UINT32 uStart = (bWithReserved) ? m_uReserveGet : m_uNextGet;
if (m_uNextPut == uStart)
return m_uBufSize; // full
return ((m_uNextPut - uStart) + m_uBufSize) % m_uBufSize;
}
HXBOOL
HXSimpleRingBuffer::IsFull(HXBOOL bWithReserved/*=FALSE*/)
{
return (AvailablePutBytes(bWithReserved) == 0);
}
Index: player.cpp
===================================================================
RCS file: /cvsroot/player/kit/jsr135/player.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- player.cpp 15 Feb 2006 20:00:53 -0000 1.10
+++ player.cpp 23 Feb 2006 03:14:05 -0000 1.11
@@ -51,6 +51,7 @@
#include "hxstring.h"
#include "hlxclib/string.h"
#include "hxstrutl.h"
+//#include "datasource.h"
#include "hxcom.h"
#include "hxcomm.h"
@@ -97,7 +98,8 @@
m_pGUIControl(NULL),
m_pTimeBase(NULL),
m_pGroupManager(NULL),
- m_pDSRequestQueue(NULL),
+ //m_pDataSource(NULL),
+ m_bUsingProxy(FALSE),
m_ulLoopCount(1)
{
printf("_Player:_Player(%s)\n", locator);
@@ -109,11 +111,18 @@
//XXXctd Throw exception?
}
- m_pDSRequestQueue = new CHXSimpleList;
- m_pDSRequestQueue->AddTail((void*) (int)EDataSource_connect);
- m_pDSRequestQueue->AddTail((void*) (int)EDataSource_start);
- m_pDSRequestQueue->AddTail((void*) (int)EDataSource_read);
- m_pDSRequestQueue->AddTail((void*) (int)EDataSource_read);
+ if ( m_url.Find("proxy://") == 0)
+ {
+ m_url = (const char*)(locator+strlen("proxy://"));
+ m_bUsingProxy = TRUE;
+ //m_pDataSource = new _DataSource((char*)(const char*)m_url);
+ }
+ else if ( m_url.Find("mimeType:") == 0)
+ {
+ m_bUsingProxy = TRUE;
+ // TODO handle input stream
+ }
+
m_pRealizeCallback = new RealizeCallback(this);
m_pRealizeCallback->AddRef();
@@ -172,8 +181,6 @@
HX_DELETE(m_pCreatePlayerEvent);
- HX_DELETE(m_pDSRequestQueue);
-
for (int i=0; iWait();
}
@@ -451,7 +463,7 @@
{
m_eTransState = TransState_Idle;
}
- //printf("Unblocking: %s\n", TransStateString(eState));
+ printf("Unblocking: %s\n", TransStateString(eState));
m_pEvents[eState]->SignalEvent();
m_pEvents[eState]->ResetEvent();
}
@@ -762,7 +774,6 @@
}
TransitionToState(TransState_Deallocating); // wait for READY
- printf("XXXXXXXXXXXXXXReturned from DEALLOCATING\n");
}
void
@@ -818,7 +829,6 @@
}
TransitionToState(TransState_Closing);
- printf("XXXXXXXXXXXXXXReturned from CLOSING\n");
}
void
@@ -1796,40 +1806,25 @@
printf("NOT_SUPPORTED: Player::setTimeBase\n");
}
-HXBOOL
-_Player::getData(int& off, int& len)
+//////////////////////////////////////
+// DataSource helper methods TODO: move to _DataSource
+void
+_Player::storeData(unsigned char* buf, int buflen)
{
- HXBOOL bNeedData=FALSE;
- // Ask the core if we need more data
- if (TRUE) //databuf.getlen < low water mark)
- {
- bNeedData = TRUE;
- off = 0;
- len = 256; //CHUNK_SIZE;
- }
- else
- {
- off = 0;
- len = 256;
- }
- return bNeedData;
+// m_pDataSource->storeData(buf, buflen);
}
-void
-_Player::sendData(const unsigned char* buf, int buflen)
+bool
+_Player::IsRingBufferFull()
{
- // queue up the data, send to core
-
+ return false;
+ //return m_pDataSource->IsRingBufferFull();
}
// Get a request from the queue
EDataSource
_Player::getRequest()
{
- if (m_pDSRequestQueue->IsEmpty())
- {
return EDataSource_noop;
- }
- EDataSource req = (EDataSource) (int)m_pDSRequestQueue->RemoveHead();
- return req;
+ //return m_pDataSource->getRequest();
}
Index: myplay.java
===================================================================
RCS file: /cvsroot/player/kit/jsr135/myplay.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- myplay.java 15 Feb 2006 20:00:53 -0000 1.11
+++ myplay.java 23 Feb 2006 03:14:05 -0000 1.12
@@ -9,7 +9,7 @@
import javax.microedition.media.*;
import javax.microedition.media.control.*;
import javax.microedition.media.protocol.*;
-import javax.microedition.lcdui.*;
+//import javax.microedition.lcdui.*;
import javax.swing.*;
class play {
@@ -17,8 +17,7 @@
public static void main(String[] args) {
if (args.length < 1) {
System.out.println("Using default url..");
- new MyPlayer().playDataSource("c:\\src\\music\\alice.rm");
- //new MyPlayer().playUrl("c:\\src\\music\\alice.rm");
+ new MyPlayer().playUrl("c:\\src\\music\\alice.rm");
//new MyPlayer().playUrl("rtsp://clientqa.dev.prognet.com/alice.rm");
//new MyPlayer().playUrl("c:\\src\\music\\buena1.rm");
//new MyPlayer().playUrl("c:\\src\\music\\laika.mp3");
@@ -42,7 +41,23 @@
if (args.length > 1) {
new MyPlayer().playUrlVideo(args[1]);
} else {
- new MyPlayer().playUrlVideo("c:\\src\\music\\buena1.rm");
+ new MyPlayer().playUrlVideo("c:\\src\\music\\alice.rm");
+ }
+ return;
+ }
+ else if (args.length > 0 && args[0].compareTo("-ds") == 0) {
+ if (args.length > 1) {
+ new MyPlayer().playDataSource(args[1]);
+ } else {
+ new MyPlayer().playDataSource("c:\\src\\music\\alice.rm");
+ }
+ return;
+ }
+ else if (args.length > 0 && args[0].compareTo("-3") == 0) {
+ if (args.length > 1) {
+ new MyMMAPIPlayer().playScenario3(args[1]);
+ } else {
+ new MyMMAPIPlayer().playScenario3("c:\\src\\music\\alice.rm");
}
return;
}
@@ -55,6 +70,7 @@
}
+
class MyPlayer extends java.awt.Container implements javax.microedition.media.PlayerListener {
java.awt.Component comp=null;
@@ -68,8 +84,8 @@
player.start();
- System.out.println("Playing for 4s...");
- Thread.currentThread().sleep(4000);
+ System.out.println("Playing for 40s...");
+ Thread.currentThread().sleep(40000);
player.close();
@@ -78,6 +94,7 @@
} catch (InterruptedException ie) {
}
}
+
public void playInputStream(String url, String mimeType) {
try {
@@ -770,3 +787,52 @@
}
+class Listener implements PlayerListener {
+
+ public static final long SECS_TO_MICROSECS = 1000000L;
+ public void playerUpdate(Player p, String event, Object eventData) {
+
+ if (event == END_OF_MEDIA || event == STOPPED_AT_TIME) {
+ System.out.println("Done processing");
+ try {
+ p.setMediaTime(5 * SECS_TO_MICROSECS);
+ p.start();
+ } catch (MediaException me) { }
+ }
+ }
+}
+
+class MyMMAPIPlayer {
+ public static final long SECS_TO_MICROSECS = 1000000L;
+
+ public void playScenario3(String url) {
+
+ Player p;
+ VolumeControl vc;
+ long SECS_TO_MICROSECS = 1000000L;
+
+ try {
+ p = Manager.createPlayer(url);
+ p.realize();
+
+ // Set a listener.
+ p.addPlayerListener(new Listener());
+ // Grab volume control for the player.
+ // Set Volume to max.
+ vc = (VolumeControl)p.getControl("VolumeControl");
+ if (vc != null)
+ vc.setLevel(100);
+
+ // Set a start time.
+ p.setMediaTime(5 * SECS_TO_MICROSECS);
+
+ // Guarantee that the player can start with the smallest latency.
+ p.prefetch();
+
+ // Non-blocking start
+ p.start();
+ } catch (IOException ioe) {
+ } catch (MediaException me) { }
+
+ }
+}
Index: manager.cpp
===================================================================
RCS file: /cvsroot/player/kit/jsr135/manager.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- manager.cpp 15 Feb 2006 20:00:53 -0000 1.6
+++ manager.cpp 23 Feb 2006 03:14:05 -0000 1.7
@@ -288,6 +288,7 @@
_Manager::InitMediaPlatform()
{
HX_RESULT hr=HXR_OK;
+ IHXCommonClassFactory* pCCF = NULL;
// Open the media platform
if (HXR_OK != (hr = m_fpHXMediaPlatformOpen()))
@@ -308,13 +309,11 @@
}
// Get the class factory
- IHXCommonClassFactory* pCCF = NULL;
if (HXR_OK != (hr = m_pMediaPlatform->QueryInterface(IID_IHXCommonClassFactory, (void**)&pCCF)))
{
goto cleanup;
}
-
if (HXR_OK != (hr = pCCF->CreateInstance(CLSID_IHXClientEngine, (void**)&m_pClientEngine)))
{
HX_RELEASE(pCCF);
Index: Umakefil
===================================================================
RCS file: /cvsroot/player/kit/jsr135/Umakefil,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Umakefil 15 Feb 2006 20:00:53 -0000 1.7
+++ Umakefil 23 Feb 2006 03:14:05 -0000 1.8
@@ -66,6 +66,7 @@
'enginedriver.cpp',
'PlayerCallback.cpp',
'DataSourceCallback.cpp',
+ 'hxsimpleringbuf.cpp',
)
project.AddModuleLibraries("common/dbgtool[debuglib]",
@@ -92,8 +93,9 @@
project.writeln('PACKAGEDIR="javax/microedition/media"')
project.writeln("PACKAGENAME=javax.microedition.media")
project.writeln("SWIGFLAGS=-java -c++")
-project.writeln("mmapi.i: pub/manager.h pub/player.h")
-project.writeln("manager_wrap.cpp: mmapi.i $(PACKAGEDIR)")
+#project.writeln("mmapi.i: pub/manager.h pub/player.h")
+#project.writeln("manager_wrap.cpp: mmapi.i")
+project.writeln("swiggen: mmapi.i pub/manager.h pub/player.h")
project.writeln(" $(SWIG) $(SWIGFLAGS) -outdir $(PACKAGEDIR) -package $(PACKAGENAME) -o manager_wrap.cpp mmapi.i")
project.writeln("javatest: myplay.java ")
Index: DataSourceCallback.cpp
===================================================================
RCS file: /cvsroot/player/kit/jsr135/DataSourceCallback.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DataSourceCallback.cpp 15 Feb 2006 20:00:53 -0000 1.1
+++ DataSourceCallback.cpp 23 Feb 2006 03:14:05 -0000 1.2
@@ -1,9 +1,9 @@
#include
-#include "javax_microedition_media_DataSourceCallback.h"
+#include "javax_microedition_media_DataSourceHelper.h"
#include "player.h"
-JNIEXPORT void JNICALL Java_javax_microedition_media_DataSourceCallback_pollDataSourceCallback
+JNIEXPORT void JNICALL Java_javax_microedition_media_DataSourceHelper_pollDataSourceCallback
(JNIEnv *pEnv, jobject obj, jlong cPtr)
{
jclass cls = pEnv->GetObjectClass(obj);
@@ -15,10 +15,10 @@
// Get the C++ Player object, check if we need more data
_Player* pPlayer = *(_Player **)(void *)&cPtr;
+ int req;
- if (pPlayer)
+ while (pPlayer && (req = pPlayer->getRequest()) && req != EDataSource_noop)
{
- int req = pPlayer->getRequest();
switch (req) {
case EDataSource_connect :
mid = pEnv->GetMethodID(cls, "connect", "()V");
@@ -32,15 +32,16 @@
case EDataSource_stop :
mid = pEnv->GetMethodID(cls, "stop", "()V");
break;
- case EDataSource_read :
- mid = pEnv->GetMethodID(cls, "read", "(II)Ljava/lang/Object;");
- break;
+// case EDataSource_read :
+ // mid = pEnv->GetMethodID(cls, "read", "(II)Ljava/lang/Object;");
+// break;
}
if (mid == 0) {
return;
}
+ /*
int off=0;
int len=0;
jbyteArray byteArray;
@@ -62,8 +63,9 @@
pEnv->ReleaseByteArrayElements(byteArray, (jbyte*)buf, JNI_ABORT);
}
else
+ */
{
- pEnv->CallObjectMethod(obj, mid, off, len);
+ pEnv->CallObjectMethod(obj, mid);
}
}
From cdunn at helixcommunity.org Wed Feb 22 19:14:08 2006
From: cdunn at helixcommunity.org (cdunn@helixcommunity.org)
Date: Wed Feb 22 21:24:31 2006
Subject: [Player-cvs] kit/jsr135/javax/microedition/media
DataSourceHelper.java, NONE, 1.1 DataSourceCallback.java, 1.1,
1.2 Manager.java, 1.4, 1.5 MyDataSource.java, 1.1,
1.2 PlayerImp.java, 1.8, 1.9 _Player.java, 1.6,
1.7 _ToneControl.java, 1.1, 1.2 _VideoControl.java, 1.4,
1.5 mmapiJNI.java, 1.8, 1.9
Message-ID:
Update of /cvsroot/player/kit/jsr135/javax/microedition/media
In directory cvs:/tmp/cvs-serv32268/javax/microedition/media
Modified Files:
DataSourceCallback.java Manager.java MyDataSource.java
PlayerImp.java _Player.java _ToneControl.java
_VideoControl.java mmapiJNI.java
Added Files:
DataSourceHelper.java
Log Message:
Update..
Index: _Player.java
===================================================================
RCS file: /cvsroot/player/kit/jsr135/javax/microedition/media/_Player.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- _Player.java 3 Feb 2006 22:27:12 -0000 1.6
+++ _Player.java 23 Feb 2006 03:14:06 -0000 1.7
@@ -129,6 +129,18 @@
return (cPtr == 0) ? null : new _GUIControl(cPtr, false);
}
+ public boolean IsRingBufferFull() {
+ return mmapiJNI._Player_IsRingBufferFull(swigCPtr);
+ }
+
+ public void storeData(byte[] buf, int buflen) {
+ mmapiJNI._Player_storeData(swigCPtr, buf, buflen);
+ }
+
+ public SWIGTYPE_p_EDataSource getRequest() {
+ return new SWIGTYPE_p_EDataSource(mmapiJNI._Player_getRequest(swigCPtr), true);
+ }
+
public String[] getControls() {
return mmapiJNI._Player_getControls(swigCPtr);
}
Index: _VideoControl.java
===================================================================
RCS file: /cvsroot/player/kit/jsr135/javax/microedition/media/_VideoControl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- _VideoControl.java 8 Feb 2006 00:33:27 -0000 1.4
+++ _VideoControl.java 23 Feb 2006 03:14:06 -0000 1.5
@@ -86,9 +86,8 @@
return mmapiJNI._VideoControl_getDisplayHeight(swigCPtr);
}
- public SWIGTYPE_p_unsigned_char getSnapshot(String imageType) {
- long cPtr = mmapiJNI._VideoControl_getSnapshot(swigCPtr, imageType);
- return (cPtr == 0) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false);
+ public byte[] getSnapshot(String imageType) {
+ return mmapiJNI._VideoControl_getSnapshot(swigCPtr, imageType);
}
}
Index: PlayerImp.java
===================================================================
RCS file: /cvsroot/player/kit/jsr135/javax/microedition/media/PlayerImp.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PlayerImp.java 15 Feb 2006 20:00:54 -0000 1.8
+++ PlayerImp.java 23 Feb 2006 03:14:06 -0000 1.9
@@ -11,10 +11,11 @@
private _Player p;
private Vector listeners=null;
private PlayerCallback pc=null;
- private DataSourceCallback dsc=null;
+ private DataSourceHelper dsc=null;
private int MAX_CONTROLS=7;
private Control[] cs = new Control[MAX_CONTROLS];
private TimeBase tb=null;
+ private String mimeType;
public PlayerImp(_Player p) {
this.p = p;
@@ -22,13 +23,14 @@
public PlayerImp(_Player p, DataSource ds) {
this.p = p;
- dsc = new DataSourceCallback(p, ds);
+ dsc = new DataSourceHelper(p, ds);
dsc.startThread(); // Start the callback polling thread
}
- public PlayerImp(_Player p, InputStream is) {
+ public PlayerImp(_Player p, InputStream is, String type) {
this.p = p;
- dsc = new DataSourceCallback(p, is);
+ mimeType = type;
+ dsc = new DataSourceHelper(p, is);
dsc.startThread(); // Start the callback polling thread
}
Index: Manager.java
===================================================================
RCS file: /cvsroot/player/kit/jsr135/javax/microedition/media/Manager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Manager.java 15 Feb 2006 20:00:54 -0000 1.4
+++ Manager.java 23 Feb 2006 03:14:06 -0000 1.5
@@ -60,7 +60,7 @@
String locator = source.getLocator();
if (!locator.startsWith("proxy:")) {
- //locator = "proxy://" + locator;
+ locator = "proxy://" + locator;
}
System.out.println("Manager::createPlayer : locator = "+ locator);
_Player p = _Manager.createPlayer(locator);
@@ -75,8 +75,10 @@
initCore();
}
System.out.println("Manager::createPlayer(InputStream)");
- System.out.println(" NOT IMPLEMENTED");
- return null;
+ System.out.println(" PARTIALLY IMPLEMENTED ");
+ String mimeType = "mimeType:"+type;
+ _Player p = _Manager.createPlayer(mimeType);
+ return new PlayerImp(p, stream, type);
}
public static void playTone(int note, int duration, int volume)
Index: _ToneControl.java
===================================================================
RCS file: /cvsroot/player/kit/jsr135/javax/microedition/media/_ToneControl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- _ToneControl.java 20 Jan 2006 21:01:26 -0000 1.1
+++ _ToneControl.java 23 Feb 2006 03:14:06 -0000 1.2
@@ -37,8 +37,8 @@
this(mmapiJNI.new__ToneControl(SWIGTYPE_p_IHXPlayer.getCPtr(pPlayer)), true);
}
- public void setSequence(SWIGTYPE_p_unsigned_char sequence) {
- mmapiJNI._ToneControl_setSequence(swigCPtr, SWIGTYPE_p_unsigned_char.getCPtr(sequence));
+ public void setSequence(byte[] sequence) {
+ mmapiJNI._ToneControl_setSequence(swigCPtr, sequence);
}
}
Index: MyDataSource.java
===================================================================
RCS file: /cvsroot/player/kit/jsr135/javax/microedition/media/MyDataSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MyDataSource.java 15 Feb 2006 20:00:54 -0000 1.1
+++ MyDataSource.java 23 Feb 2006 03:14:06 -0000 1.2
@@ -10,6 +10,7 @@
private SourceStream[] sslist = new SourceStream[1]; // just one stream, for now
private String contentType;
+ private boolean bConnectedState=false;
// Construct a DataSource from a locator.
public MyDataSource(java.lang.String locator) {
@@ -23,15 +24,42 @@
}
public void connect() throws java.io.IOException, SecurityException {
+ bConnectedState = true;
+ /*
+ try {
+ } catch (java.io.IOException ioe) {
+ System.out.println("Could not connect to data source. " + ioe.getMessage());
+ }
+ */
}
public void disconnect() {
+ try {
+ stop(); // implicitly call stop data transfer
+ } catch (java.io.IOException ioe) {
+ }
+ bConnectedState = false;
}
public void start() throws IllegalStateException, java.io.IOException, SecurityException {
+ if (bConnectedState == false) {
+ throw new IllegalStateException("DataSource has not been connected.");
+ }
+ /*
+ try {
+ } catch (java.io.IOException ioe) {
+ System.out.println("Could not start data transfer of data source. " + ioe.getMessage());
+ }
+ */
}
public void stop() throws java.io.IOException {
+ /*
+ try {
+ } catch (java.io.IOException ioe) {
+ System.out.println("Could not stop data transfer of data source. " + ioe.getMessage());
+ }
+ */
}
public SourceStream[] getStreams() throws IllegalStateException {
Index: DataSourceCallback.java
===================================================================
RCS file: /cvsroot/player/kit/jsr135/javax/microedition/media/DataSourceCallback.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DataSourceCallback.java 15 Feb 2006 20:00:54 -0000 1.1
+++ DataSourceCallback.java 23 Feb 2006 03:14:06 -0000 1.2
@@ -3,22 +3,25 @@
import javax.microedition.media.protocol.*;
import java.io.InputStream;
-public class DataSourceCallback implements Runnable {
-
- private native void pollDataSourceCallback(long p);
+public class DataSourceHelper implements Runnable {
private Thread t;
private boolean done=false;
private _Player p;
private DataSource ds;
private InputStream is=null;
+ private SourceStream ss0=null;
- public DataSourceCallback(_Player p, DataSource ds) {
+ public DataSourceHelper(_Player p, DataSource ds) {
this.p = p;
this.ds = ds;
+ SourceStream ss[] = ds.getStreams();
+ if (ss != null) {
+ ss0 = ss[0];
+ }
}
- public DataSourceCallback(_Player p, InputStream is) {
+ public DataSourceHelper(_Player p, InputStream is) {
this.p = p;
this.is = is;
}
@@ -27,7 +30,7 @@
public void startThread() {
done = false;
t = new Thread(this);
- t.setName("DataSourceCallback");
+ t.setName("DataSourceHelper");
t.start();
}
@@ -41,18 +44,64 @@
public void run() {
- System.out.println("Starting to poll for read requests:"+Thread.currentThread());
+ System.out.println("Starting to read from source/input stream:"+Thread.currentThread());
+ int off = 0; // p.getOffset() ?
+ int len = 1024 * 2; // p.getMaxBufLen(); ?
+ int bytesRead;
+ int totalBytesRead=0;
+ byte[] b= new byte[len];
try {
while (!done) {
- Thread.currentThread().sleep(20);
- pollDataSourceCallback(_Player.getCPtr(p)); // Send in _Player C++ object
+ if (p.getState() == Player.CLOSED) {
+ done = true;
+ } else if (p.IsRingBufferFull()) {
+ Thread.currentThread().sleep(20);
+ } else {
+ bytesRead = read(b, off, len);
+ if (bytesRead > 0) {
+ p.storeData(b, bytesRead);
+ totalBytesRead += bytesRead;
+ } else if (bytesRead == -1) {
+ // end of file
+ System.out.println("DataSourceHelper: Reached end of file. Total bytes read: "+totalBytesRead);
+ //done = true;
+
+ } else { // progressive download when bytesRead == 0?
+ Thread.currentThread().sleep(20);
+ }
+
+ }
}
} catch (java.lang.InterruptedException ie) {
- System.out.println("Caught exception");
+ System.out.println("Thread interrupted: " + ie.getMessage());
}
}
+ private int read(byte[] b, int off, int len) {
+
+ int bytesRead=0;
+
+ if (ds != null) {
+ // Read from the DataSource (SourceStream)
+ try {
+ bytesRead = ss0.read(b, off, len);
+ } catch (java.io.IOException ioe) {
+ System.out.println("Could not read " + ioe.getMessage());
+ }
+
+ } else if (is != null) {
+ // Read from the InputStream
+ try {
+ bytesRead = is.read(b, off, len);
+ } catch (java.io.IOException ioe) {
+ System.out.println("Could not read " + ioe.getMessage());
+ }
+ }
+
+ return bytesRead;
+ }
+ /*
private java.lang.Object read(int off, int len) {
byte b[]= new byte[len];
@@ -86,6 +135,7 @@
return (Object)b;
}
+ */
public void dispatch(String methodName) {
/*
@@ -98,7 +148,7 @@
}
public void connect() {
- System.out.println("DataSourceCallback::connect");
+ System.out.println("DataSourceHelper::connect");
if (ds != null) {
try {
ds.connect();
@@ -109,7 +159,7 @@
}
public void disconnect() {
- System.out.println("DataSourceCallback::disconnect");
+ System.out.println("DataSourceHelper::disconnect");
try {
if (ds != null) {
ds.stop(); // implicitly call stop data transfer
@@ -123,7 +173,7 @@
}
public void start() {
- System.out.println("DataSourceCallback::start");
+ System.out.println("DataSourceHelper::start");
if (ds != null) {
try {
ds.start();
@@ -134,7 +184,7 @@
}
public void stop() {
- System.out.println("DataSourceCallback::stop");
+ System.out.println("DataSourceHelper::stop");
if (ds != null) {
try {
ds.stop(); // stop data transfer
--- NEW FILE: DataSourceHelper.java ---
package javax.microedition.media;
import javax.microedition.media.protocol.*;
import java.io.InputStream;
public class DataSourceHelper implements Runnable {
private native void pollDataSourceCallback(long p);
private Thread t;
private boolean done=false;
private _Player p;
private DataSource ds;
private InputStream is=null;
private SourceStream ss0=null;
public DataSourceHelper(_Player p, DataSource ds) {
this.p = p;
this.ds = ds;
SourceStream ss[] = ds.getStreams();
if (ss != null) {
ss0 = ss[0];
}
}
public DataSourceHelper(_Player p, InputStream is) {
this.p = p;
this.is = is;
}
public void startThread() {
done = false;
t = new Thread(this);
t.setName("DataSourceHelper");
t.start();
}
public void stopThread() {
done = true;
}
protected void finalize() {
done = true; // stop the thread
}
public void run() {
System.out.println("Starting to read from source/input stream:"+Thread.currentThread());
int off = 0; // p.getOffset() ?
int len = 1024 * 2; // p.getMaxBufLen(); ?
int bytesRead;
int totalBytesRead=0;
byte[] b= new byte[len];
try {
while (!done) {
pollDataSourceCallback(_Player.getCPtr(p)); // Send in _Player C++ object
if (p.getState() == Player.CLOSED) {
done = true;
} else if (p.IsRingBufferFull()) {
Thread.currentThread().sleep(20);
} else {
bytesRead = read(b, off, len);
if (bytesRead > 0) {
p.storeData(b, bytesRead);
totalBytesRead += bytesRead;
} else if (bytesRead == -1) {
// end of file
System.out.println("DataSourceHelper: Reached end of file. Total bytes read: "+totalBytesRead);
done = true;
} else { // progressive download when bytesRead == 0?
Thread.currentThread().sleep(20);
}
}
}
} catch (java.lang.InterruptedException ie) {
System.out.println("Thread interrupted: " + ie.getMessage());
}
}
private int read(byte[] b, int off, int len) {
int bytesRead=0;
if (ds != null) {
// Read from the DataSource (SourceStream)
try {
bytesRead = ss0.read(b, off, len);
} catch (java.io.IOException ioe) {
System.out.println("Could not read " + ioe.getMessage());
}
} else if (is != null) {
// Read from the InputStream
try {
bytesRead = is.read(b, off, len);
} catch (java.io.IOException ioe) {
System.out.println("Could not read " + ioe.getMessage());
}
}
return bytesRead;
}
public void dispatch(String methodName) {
/*
if (methodName.equals("stop")) {
ds.stop();
} else if (methodName.equals("start")) {
ds.start();
}
*/
}
public void connect() throws java.io.IOException {
System.out.println("DataSourceHelper::connect");
if (ds != null) {
ds.connect();
}
}
public void disconnect() throws java.io.IOException {
System.out.println("DataSourceHelper::disconnect");
if (ds != null) {
ds.disconnect(); // disconnect from the data source
} else if (is != null) {
is.close(); // close the InputStream
}
}
public void start() throws java.io.IOException {
System.out.println("DataSourceHelper::start");
if (ds != null) {
ds.start();
}
}
public void stop() throws java.io.IOException {
System.out.println("DataSourceHelper::stop");
if (ds != null) {
ds.stop(); // stop data transfer
}
}
}
Index: mmapiJNI.java
===================================================================
RCS file: /cvsroot/player/kit/jsr135/javax/microedition/media/mmapiJNI.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mmapiJNI.java 8 Feb 2006 00:33:27 -0000 1.8
+++ mmapiJNI.java 23 Feb 2006 03:14:06 -0000 1.9
@@ -45,6 +45,9 @@
public final static native long _Player_getToneControl(long jarg1);
public final static native long _Player_getStopTimeControl(long jarg1);
public final static native long _Player_getGUIControl(long jarg1);
+ public final static native boolean _Player_IsRingBufferFull(long jarg1);
+ public final static native void _Player_storeData(long jarg1, byte[] jarg2, int jarg3);
+ public final static native long _Player_getRequest(long jarg1);
public final static native String[] _Player_getControls(long jarg1);
public final static native long _Player_getTimeBase(long jarg1);
public final static native void _Player_setTimeBase(long jarg1, long jarg2);
@@ -69,7 +72,7 @@
public final static native int _VideoControl_getSourceHeight(long jarg1);
public final static native int _VideoControl_getDisplayWidth(long jarg1);
public final static native int _VideoControl_getDisplayHeight(long jarg1);
- public final static native long _VideoControl_getSnapshot(long jarg1, String jarg2);
+ public final static native byte[] _VideoControl_getSnapshot(long jarg1, String jarg2);
public final static native long new__GUIControl(long jarg1);
public final static native void delete__GUIControl(long jarg1);
public final static native int get__GUIControl_USE_GUI_PRIMITIVE();
@@ -88,7 +91,7 @@
public final static native int _RateControl_getMinRate(long jarg1);
public final static native long new__ToneControl(long jarg1);
public final static native void delete__ToneControl(long jarg1);
- public final static native void _ToneControl_setSequence(long jarg1, long jarg2);
+ public final static native void _ToneControl_setSequence(long jarg1, byte[] jarg2);
public final static native long new__StopTimeControl(long jarg1);
public final static native void delete__StopTimeControl(long jarg1);
public final static native void _StopTimeControl_setStopTime(long jarg1, long jarg2);
From cdunn at helixcommunity.org Wed Feb 22 19:14:09 2006
From: cdunn at helixcommunity.org (cdunn@helixcommunity.org)
Date: Wed Feb 22 21:24:31 2006
Subject: [Player-cvs] kit/jsr135/pub hxsimpleringbuf.h, NONE,
1.1 javax_microedition_media_DataSourceHelper.h, NONE,
1.1 player.h, 1.8, 1.9
Message-ID:
Update of /cvsroot/player/kit/jsr135/pub
In directory cvs:/tmp/cvs-serv32268/pub
Modified Files:
player.h
Added Files:
hxsimpleringbuf.h javax_microedition_media_DataSourceHelper.h
Log Message:
Update..
--- NEW FILE: hxsimpleringbuf.h ---
#ifndef __HXSIMPLERINGBUF_H_
#define __HXSIMPLERINGBUF_H_
#include "hxtypes.h"
class HXSimpleRingBuffer
{
public:
HXSimpleRingBuffer(UINT32 uBufSize, UINT32 uReserveSize=0);
~HXSimpleRingBuffer();
void Reset() {
m_uNextGet = 0;
m_uNextPut = 0;
m_uReserveGet = 0;
m_bEmpty = TRUE;
}
HXBOOL Get(BYTE* buf, UINT32& uLen, HXBOOL bWithReserved=FALSE);
HXBOOL Put(const BYTE* buf, UINT32 uLen, HXBOOL bWithReserved=FALSE);
HXBOOL IsFull(HXBOOL bWithReserved=FALSE);
HXBOOL IsEmpty() { return m_bEmpty; } // returns true if there is no data in the buffer, at all
UINT32 AvailablePutBytes(HXBOOL bWithReserved=FALSE);
UINT32 AvailableGetBytes(HXBOOL bWithReserved=FALSE);
private:
BYTE* m_pRingBuffer;
UINT32 m_uBufSize; // size of the ring buffer
UINT32 m_uReservedBytes; // number of bytes to reserve in the ring, for seeking
UINT32 m_uNextGet; // Index to Next position to get bytes (start)
UINT32 m_uNextPut; // Index to Next position to put bytes (end)
UINT32 m_uReserveGet; // position behind the next get to reserve for seeking, start position of valid data
HXBOOL m_bEmpty; // Indicates if there is any data in the ring buffer, usually after reset, or on init
};
#endif // __HXSIMPLERINGBUF_H_
Index: player.h
===================================================================
RCS file: /cvsroot/player/kit/jsr135/pub/player.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- player.h 15 Feb 2006 20:00:55 -0000 1.8
+++ player.h 23 Feb 2006 03:14:06 -0000 1.9
@@ -35,7 +35,7 @@
class _MediaException;
class _IllegalStateException;
class HXBasicGroupManager;
-class CHXSimpleList;
+//class _DataSource;
struct IHXScheduler;
struct IHXClientState;
struct IHXClientStateAdviseSink;
@@ -138,6 +138,12 @@
_ToneControl* getToneControl();
_StopTimeControl* getStopTimeControl();
_GUIControl* getGUIControl();
+
+ // DataSource helper methods
+ bool IsRingBufferFull();
+ void storeData(unsigned char* buf, int buflen);
+ EDataSource getRequest();
+
#ifdef SWIG
char** getControls();
#else
@@ -167,11 +173,6 @@
UINT16 uOldState,
UINT16 uNewState);
- // DataSource helper methods
- HXBOOL getData(int& off, int& len);
- void sendData(const unsigned char* buf, int buflen);
- EDataSource getRequest();
- //
//EDataSource getRequest(CHXString& methodName, CHXString& methodSignature);
// NOTE: this could be used in the future for flexibility
// use "javap -s -p {className}" to get the correct signature
@@ -381,7 +382,9 @@
IHXScheduler* m_pScheduler;
HXMutex* m_pMutex;
LONG32 m_lRefCount;
- CHXSimpleList* m_pDSRequestQueue;
+
+ HXBOOL m_bUsingProxy;
+ //_DataSource* m_pDataSource;
HXEvent* m_pCreatePlayerEvent;
HXEvent* m_pEvents[TransState_Count];
--- NEW FILE: javax_microedition_media_DataSourceHelper.h ---
/* DO NOT EDIT THIS FILE - it is machine generated */
#include
/* Header for class javax_microedition_media_DataSourceHelper */
#ifndef _Included_javax_microedition_media_DataSourceHelper
#define _Included_javax_microedition_media_DataSourceHelper
#ifdef __cplusplus
extern "C" {
#endif
/*
* Class: javax_microedition_media_DataSourceHelper
* Method: pollDataSourceHelper
* Signature: (J)V
*/
JNIEXPORT void JNICALL Java_javax_microedition_media_DataSourceHelper_pollDataSourceCallback
(JNIEnv *, jobject, jlong);
#ifdef __cplusplus
}
#endif
#endif
From cdunn at helixcommunity.org Wed Feb 22 19:34:48 2006
From: cdunn at helixcommunity.org (cdunn@helixcommunity.org)
Date: Wed Feb 22 21:45:15 2006
Subject: [Player-cvs] kit/jsr135/javax/microedition/media
SWIGTYPE_p_EDataSource.java, NONE,
1.1 SWIGTYPE_p_HXJClientAdviseSink.java, NONE,
1.1 SWIGTYPE_p_IHXPlayer.java, NONE, 1.1
Message-ID:
Update of /cvsroot/player/kit/jsr135/javax/microedition/media
In directory cvs:/tmp/cvs-serv2045
Added Files:
SWIGTYPE_p_EDataSource.java
SWIGTYPE_p_HXJClientAdviseSink.java SWIGTYPE_p_IHXPlayer.java
Log Message:
--- NEW FILE: SWIGTYPE_p_EDataSource.java ---
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 1.3.25
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package javax.microedition.media;
public class SWIGTYPE_p_EDataSource {
private long swigCPtr;
protected SWIGTYPE_p_EDataSource(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_EDataSource() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_EDataSource obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}
--- NEW FILE: SWIGTYPE_p_HXJClientAdviseSink.java ---
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 1.3.25
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package javax.microedition.media;
public class SWIGTYPE_p_HXJClientAdviseSink {
private long swigCPtr;
protected SWIGTYPE_p_HXJClientAdviseSink(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_HXJClientAdviseSink() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_HXJClientAdviseSink obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}
--- NEW FILE: SWIGTYPE_p_IHXPlayer.java ---
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 1.3.25
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
package javax.microedition.media;
public class SWIGTYPE_p_IHXPlayer {
private long swigCPtr;
protected SWIGTYPE_p_IHXPlayer(long cPtr, boolean futureUse) {
swigCPtr = cPtr;
}
protected SWIGTYPE_p_IHXPlayer() {
swigCPtr = 0;
}
protected static long getCPtr(SWIGTYPE_p_IHXPlayer obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
}
From rishimathew at helixcommunity.org Fri Feb 24 10:56:20 2006
From: rishimathew at helixcommunity.org (rishimathew@helixcommunity.org)
Date: Fri Feb 24 13:06:16 2006
Subject: [Player-cvs] CVSROOT avail,1.38,1.39
Message-ID:
Update of /cvsroot/player/CVSROOT
In directory cvs:/tmp/cvs-serv31465/CVSROOT
Modified Files:
avail
Log Message:
giving olivierd write access for the 'player' project
Index: avail
===================================================================
RCS file: /cvsroot/player/CVSROOT/avail,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- avail 25 Jan 2006 21:39:02 -0000 1.38
+++ avail 24 Feb 2006 18:56:17 -0000 1.39
@@ -124,6 +124,7 @@
avail|nhart
avail|nhunshyal
avail|nick
+avail|olivierd
avail|ottoreck
avail|pankajgupta
avail|pfawcett
From bobclark at helixcommunity.org Mon Feb 27 18:36:09 2006
From: bobclark at helixcommunity.org (bobclark@helixcommunity.org)
Date: Mon Feb 27 20:45:17 2006
Subject: [Player-cvs] app/gtk README.realplay.in,1.1.2.8.2.1,1.1.2.8.2.2
Message-ID:
Update of /cvsroot/player/app/gtk
In directory cvs:/tmp/cvs-serv24462
Modified Files:
Tag: bingo_release_10_0_3
README.realplay.in
Log Message:
update date
Index: README.realplay.in
===================================================================
RCS file: /cvsroot/player/app/gtk/README.realplay.in,v
retrieving revision 1.1.2.8.2.1
retrieving revision 1.1.2.8.2.2
diff -u -d -r1.1.2.8.2.1 -r1.1.2.8.2.2
--- README.realplay.in 1 Apr 2005 21:26:05 -0000 1.1.2.8.2.1
+++ README.realplay.in 28 Feb 2006 02:36:06 -0000 1.1.2.8.2.2
@@ -3,7 +3,7 @@
Release Notes
- April 2005
+ March 2006
System Requirements
From bobclark at helixcommunity.org Tue Feb 28 13:50:39 2006
From: bobclark at helixcommunity.org (bobclark@helixcommunity.org)
Date: Tue Feb 28 15:59:36 2006
Subject: [Player-cvs] installer/rpm RealPlayer-jds3.spec, 1.1.4.1.2.3,
1.1.4.1.2.4 RealPlayer-nld.spec, 1.4.2.7.2.6,
1.4.2.7.2.7 RealPlayer-rhel4.spec, 1.1.4.4.2.3,
1.1.4.4.2.4 RealPlayer-turbo10.spec, 1.1.2.6.2.3, 1.1.2.6.2.4
Message-ID:
Update of /cvsroot/player/installer/rpm
In directory cvs:/tmp/cvs-serv14390
Modified Files:
Tag: bingo_release_10_0_3
RealPlayer-jds3.spec RealPlayer-nld.spec RealPlayer-rhel4.spec
RealPlayer-turbo10.spec
Log Message:
update spec files to 10.0.7
Index: RealPlayer-nld.spec
===================================================================
RCS file: /cvsroot/player/installer/rpm/RealPlayer-nld.spec,v
retrieving revision 1.4.2.7.2.6
retrieving revision 1.4.2.7.2.7
diff -u -d -r1.4.2.7.2.6 -r1.4.2.7.2.7
--- RealPlayer-nld.spec 22 Aug 2005 02:57:56 -0000 1.4.2.7.2.6
+++ RealPlayer-nld.spec 28 Feb 2006 21:50:36 -0000 1.4.2.7.2.7
@@ -1,5 +1,5 @@
#
-# spec file for package RealPlayer (Version 10.0.6)
+# spec file for package RealPlayer (Version 10.0.)
#
# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -85,7 +85,7 @@
PreReq: /bin/rm shared-mime-info
Requires: gnome-icon-theme
Autoreqprov: on
-Version: 10.0.6
+Version: 10.0.7
Release: 1
Summary: RealPlayer 10 for Linux
URL: http://www.real.com/linux
@@ -270,6 +270,9 @@
/opt/kde3
%changelog -n RealPlayer
+* Tue Feb 28 2006 - bobclark@real.com
+- 10.0.7 update
+
* Fri Aug 19 2005 - rgammon@real.com
- 10.0.6 update
* Tue Apr 26 2005 - ro@suse.de
Index: RealPlayer-jds3.spec
===================================================================
RCS file: /cvsroot/player/installer/rpm/Attic/RealPlayer-jds3.spec,v
retrieving revision 1.1.4.1.2.3
retrieving revision 1.1.4.1.2.4
diff -u -d -r1.1.4.1.2.3 -r1.1.4.1.2.4
--- RealPlayer-jds3.spec 19 Aug 2005 22:53:49 -0000 1.1.4.1.2.3
+++ RealPlayer-jds3.spec 28 Feb 2006 21:50:36 -0000 1.1.4.1.2.4
@@ -51,7 +51,7 @@
Summary: RealPlayer 10 for Linux
Name: RealPlayer
-Version: 10.0.6
+Version: 10.0.7
Release: 1
Group: Applications/Multimedia
License: RPSL, EULA
@@ -71,7 +71,7 @@
GPL/RPSL Helix Player 1.0.
%prep
-%setup -q -c -n realplay-10.0.6
+%setup -q -c -n realplay-10.0.7
%patch1 -p1 -b .helixlibs
%patch2 -p1 -b .unclaim-audio
@@ -87,16 +87,16 @@
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime-info
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/application-registry
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6/share
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7/share
-cp -a ./codecs $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6
-cp -a ./common $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6
-cp -a ./plugins $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6
-cp -a ./share/default $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6/share
-cp -a ./share/realplay $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6/share
-cp ./README $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6
-cp ./LICENSE $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6
+cp -a ./codecs $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7
+cp -a ./common $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7
+cp -a ./plugins $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7
+cp -a ./share/default $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7/share
+cp -a ./share/realplay $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7/share
+cp ./README $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7
+cp ./LICENSE $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7
cp ./mozilla/nphelix.so $RPM_BUILD_ROOT/%{_libdir}/mozilla/plugins
cp ./mozilla/nphelix.xpt $RPM_BUILD_ROOT/%{_libdir}/mozilla/plugins
@@ -106,17 +106,17 @@
install -p -m644 ./share/realplay.applications $RPM_BUILD_ROOT/%{_datadir}/application-registry
install -p -m644 ./share/realplay.keys $RPM_BUILD_ROOT/%{_datadir}/mime-info
-cp ./realplay.bin $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6
-cp ./realplay $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6
-ln -s %{_libdir}/realplay-10.0.6/realplay $RPM_BUILD_ROOT/%{_bindir}
+cp ./realplay.bin $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7
+cp ./realplay $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7
+ln -s %{_libdir}/realplay-10.0.7/realplay $RPM_BUILD_ROOT/%{_bindir}
for LANGUAGE in %{_translations}; do
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/locale/$LANGUAGE/LC_MESSAGES
- mkdir -p $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6/share/locale/$LANGUAGE
+ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7/share/locale/$LANGUAGE
cp "./share/locale/$LANGUAGE/player.mo" "$RPM_BUILD_ROOT/%{_datadir}/locale/$LANGUAGE/LC_MESSAGES/realplay.mo"
cp "./share/locale/$LANGUAGE/widget.mo" "$RPM_BUILD_ROOT/%{_datadir}/locale/$LANGUAGE/LC_MESSAGES/libgtkhx.mo"
- cp "./share/locale/$LANGUAGE/README" "$RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6/share/locale/$LANGUAGE"
- cp "./share/locale/$LANGUAGE/LICENSE" "$RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.6/share/locale/$LANGUAGE"
+ cp "./share/locale/$LANGUAGE/README" "$RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7/share/locale/$LANGUAGE"
+ cp "./share/locale/$LANGUAGE/LICENSE" "$RPM_BUILD_ROOT/%{_libdir}/realplay-10.0.7/share/locale/$LANGUAGE"
done
@@ -126,7 +126,7 @@
%files
%defattr(-,root,root)
%{_bindir}/realplay
-%{_libdir}/realplay-10.0.6/*
+%{_libdir}/realplay-10.0.7/*
%{_libdir}/mozilla/*
%{_datadir}/icons/hicolor/*
%{_datadir}/pixmaps/*
@@ -137,6 +137,9 @@
%{_datadir}/locale/*/LC_MESSAGES/*
%changelog
+* Tue Feb 28 2006 Bob Clark 10.0.7-1
+- updating to 10.0.7
+
* Fri Aug 19 2005 Ryan Gammon 10.0.6-1
- Updating to 10.0.6
Index: RealPlayer-turbo10.spec
===================================================================
RCS file: /cvsroot/player/installer/rpm/Attic/RealPlayer-turbo10.spec,v
retrieving revision 1.1.2.6.2.3
retrieving revision 1.1.2.6.2.4
diff -u -d -r1.1.2.6.2.3 -r1.1.2.6.2.4
--- RealPlayer-turbo10.spec 19 Aug 2005 22:53:49 -0000 1.1.2.6.2.3
+++ RealPlayer-turbo10.spec 28 Feb 2006 21:50:36 -0000 1.1.2.6.2.4
@@ -49,7 +49,7 @@
Summary: RealPlayer 10 for Linux
Name: RealPlayer
-Version: 10.0.6
+Version: 10.0.7
Release: 1
Group: Applications/Multimedia
License: RPSL, EULA
@@ -69,7 +69,7 @@
GPL/RPSL Helix Player 1.0.
%prep
-%setup -q -c -n realplay-10.0.6
+%setup -q -c -n realplay-10.0.7
%patch1 -p1 -b .helixlibs
%patch2 -p1 -b .kde31
@@ -193,6 +193,7 @@
%{_datadir}/locale/*/LC_MESSAGES/*
%changelog
+* 28 Feb 06 bobclark@real.com 10.0.7
* Fri Aug 19 2005 Ryan Gammon 10.0.6
- Updating for 10.0.6
Index: RealPlayer-rhel4.spec
===================================================================
RCS file: /cvsroot/player/installer/rpm/Attic/RealPlayer-rhel4.spec,v
retrieving revision 1.1.4.4.2.3
retrieving revision 1.1.4.4.2.4
diff -u -d -r1.1.4.4.2.3 -r1.1.4.4.2.4
--- RealPlayer-rhel4.spec 19 Aug 2005 22:53:49 -0000 1.1.4.4.2.3
+++ RealPlayer-rhel4.spec 28 Feb 2006 21:50:36 -0000 1.1.4.4.2.4
@@ -51,7 +51,7 @@
Summary: RealPlayer 10 for Linux
Name: RealPlayer
-Version: 10.0.6
+Version: 10.0.7
Release: 1
Group: Applications/Multimedia
License: RPSL, EULA
@@ -71,7 +71,7 @@
GPL/RPSL Helix Player 1.0.
%prep
-%setup -q -c -n realplay-10.0.6
+%setup -q -c -n realplay-10.0.7
%patch1 -p1 -b .helixlibs
%build
@@ -154,6 +154,8 @@
%{_datadir}/locale/*/LC_MESSAGES/*
%changelog
+* 28 Feb 06 bobclark@real.com 10.0.7
+
* Fri Aug 19 2005 Ryan Gammon 10.0.6-1
- Updating to 10.0.6
From bobclark at helixcommunity.org Tue Feb 28 14:16:06 2006
From: bobclark at helixcommunity.org (bobclark@helixcommunity.org)
Date: Tue Feb 28 16:25:01 2006
Subject: [Player-cvs] installer/deb/linspire-4.5 changelog, 1.1.2.3.2.3,
1.1.2.3.2.4 realplay.dirs, 1.1.2.5.2.3,
1.1.2.5.2.4 realplay.links, 1.1.2.4.2.3, 1.1.2.4.2.4 rules,
1.1.2.7.2.3, 1.1.2.7.2.4
Message-ID:
Update of /cvsroot/player/installer/deb/linspire-4.5
In directory cvs:/tmp/cvs-serv30828/deb/linspire-4.5
Modified Files:
Tag: bingo_release_10_0_3
changelog realplay.dirs realplay.links rules
Log Message:
update to 10.0.7
Index: rules
===================================================================
RCS file: /cvsroot/player/installer/deb/linspire-4.5/rules,v
retrieving revision 1.1.2.7.2.3
retrieving revision 1.1.2.7.2.4
diff -u -d -r1.1.2.7.2.3 -r1.1.2.7.2.4
--- rules 19 Aug 2005 22:32:46 -0000 1.1.2.7.2.3
+++ rules 28 Feb 2006 22:16:02 -0000 1.1.2.7.2.4
@@ -54,7 +54,7 @@
BUILD_ROOT:=$(shell pwd)/debian/realplay
-REALPLAY_VERSION=realplay-10.0.6
+REALPLAY_VERSION=realplay-10.0.7
build: build-stamp
build-stamp: patch
Index: realplay.dirs
===================================================================
RCS file: /cvsroot/player/installer/deb/linspire-4.5/realplay.dirs,v
retrieving revision 1.1.2.5.2.3
retrieving revision 1.1.2.5.2.4
diff -u -d -r1.1.2.5.2.3 -r1.1.2.5.2.4
--- realplay.dirs 19 Aug 2005 22:25:25 -0000 1.1.2.5.2.3
+++ realplay.dirs 28 Feb 2006 22:16:02 -0000 1.1.2.5.2.4
@@ -1,20 +1,20 @@
/usr/bin
-/usr/lib/realplay-10.0.6/common
-/usr/lib/realplay-10.0.6/codecs
-/usr/lib/realplay-10.0.6/plugins
-/usr/lib/realplay-10.0.6/share/default
-/usr/lib/realplay-10.0.6/share/realplay
-/usr/lib/realplay-10.0.6/share/locale/de
-/usr/lib/realplay-10.0.6/share/locale/es
-/usr/lib/realplay-10.0.6/share/locale/fr
-/usr/lib/realplay-10.0.6/share/locale/hi
-/usr/lib/realplay-10.0.6/share/locale/it
-/usr/lib/realplay-10.0.6/share/locale/ja
-/usr/lib/realplay-10.0.6/share/locale/ko
-/usr/lib/realplay-10.0.6/share/locale/pl_BR
-/usr/lib/realplay-10.0.6/share/locale/pt_BR
-/usr/lib/realplay-10.0.6/share/locale/zh_CN
-/usr/lib/realplay-10.0.6/share/locale/zh_TW
+/usr/lib/realplay-10.0.7/common
+/usr/lib/realplay-10.0.7/codecs
+/usr/lib/realplay-10.0.7/plugins
+/usr/lib/realplay-10.0.7/share/default
+/usr/lib/realplay-10.0.7/share/realplay
+/usr/lib/realplay-10.0.7/share/locale/de
+/usr/lib/realplay-10.0.7/share/locale/es
+/usr/lib/realplay-10.0.7/share/locale/fr
+/usr/lib/realplay-10.0.7/share/locale/hi
+/usr/lib/realplay-10.0.7/share/locale/it
+/usr/lib/realplay-10.0.7/share/locale/ja
+/usr/lib/realplay-10.0.7/share/locale/ko
+/usr/lib/realplay-10.0.7/share/locale/pl_BR
+/usr/lib/realplay-10.0.7/share/locale/pt_BR
+/usr/lib/realplay-10.0.7/share/locale/zh_CN
+/usr/lib/realplay-10.0.7/share/locale/zh_TW
/usr/lib/mozilla/plugins
/usr/share/locale/de/LC_MESSAGES
/usr/share/locale/es/LC_MESSAGES
Index: realplay.links
===================================================================
RCS file: /cvsroot/player/installer/deb/linspire-4.5/realplay.links,v
retrieving revision 1.1.2.4.2.3
retrieving revision 1.1.2.4.2.4
diff -u -d -r1.1.2.4.2.3 -r1.1.2.4.2.4
--- realplay.links 19 Aug 2005 22:25:25 -0000 1.1.2.4.2.3
+++ realplay.links 28 Feb 2006 22:16:02 -0000 1.1.2.4.2.4
@@ -1 +1 @@
-/usr/lib/realplay-10.0.6/realplay /usr/bin/realplay
+/usr/lib/realplay-10.0.7/realplay /usr/bin/realplay
Index: changelog
===================================================================
RCS file: /cvsroot/player/installer/deb/linspire-4.5/changelog,v
retrieving revision 1.1.2.3.2.3
retrieving revision 1.1.2.3.2.4
diff -u -d -r1.1.2.3.2.3 -r1.1.2.3.2.4
--- changelog 19 Aug 2005 22:25:25 -0000 1.1.2.3.2.3
+++ changelog 28 Feb 2006 22:16:02 -0000 1.1.2.3.2.4
@@ -1,3 +1,9 @@
+realplay (10.0.7-0.0.0.45.linspire0.1) unstable; urgency=low
+
+ * Updating to 10.0.7
+
+ -- Bob Clark Tue, 28 Feb 2006 15:00:00 -0800
+
realplay (10.0.6-0.0.0.45.linspire0.1) unstable; urgency=low
* Updating to 10.0.6
From bobclark at helixcommunity.org Tue Feb 28 14:16:06 2006
From: bobclark at helixcommunity.org (bobclark@helixcommunity.org)
Date: Tue Feb 28 16:25:02 2006
Subject: [Player-cvs] installer/deb/linspire-5.0 changelog, 1.1.4.1.2.4,
1.1.4.1.2.5 realplay.dirs, 1.1.4.1.2.4,
1.1.4.1.2.5 realplay.links, 1.1.4.1.2.3, 1.1.4.1.2.4 rules,
1.1.4.1.2.4, 1.1.4.1.2.5
Message-ID:
Update of /cvsroot/player/installer/deb/linspire-5.0
In directory cvs:/tmp/cvs-serv30828/deb/linspire-5.0
Modified Files:
Tag: bingo_release_10_0_3
changelog realplay.dirs realplay.links rules
Log Message:
update to 10.0.7
Index: rules
===================================================================
RCS file: /cvsroot/player/installer/deb/linspire-5.0/Attic/rules,v
retrieving revision 1.1.4.1.2.4
retrieving revision 1.1.4.1.2.5
diff -u -d -r1.1.4.1.2.4 -r1.1.4.1.2.5
--- rules 19 Aug 2005 22:39:19 -0000 1.1.4.1.2.4
+++ rules 28 Feb 2006 22:16:04 -0000 1.1.4.1.2.5
@@ -54,7 +54,7 @@
BUILD_ROOT:=$(shell pwd)/debian/realplay
-REALPLAY_VERSION=realplay-10.0.6
+REALPLAY_VERSION=realplay-10.0.7
build: build-stamp
build-stamp: patch
Index: realplay.dirs
===================================================================
RCS file: /cvsroot/player/installer/deb/linspire-5.0/Attic/realplay.dirs,v
retrieving revision 1.1.4.1.2.4
retrieving revision 1.1.4.1.2.5
diff -u -d -r1.1.4.1.2.4 -r1.1.4.1.2.5
--- realplay.dirs 19 Aug 2005 22:39:19 -0000 1.1.4.1.2.4
+++ realplay.dirs 28 Feb 2006 22:16:04 -0000 1.1.4.1.2.5
@@ -1,20 +1,20 @@
/usr/bin
-/usr/lib/realplay-10.0.6/common
-/usr/lib/realplay-10.0.6/codecs
-/usr/lib/realplay-10.0.6/plugins
-/usr/lib/realplay-10.0.6/share/default
-/usr/lib/realplay-10.0.6/share/realplay
-/usr/lib/realplay-10.0.6/share/locale/de
-/usr/lib/realplay-10.0.6/share/locale/es
-/usr/lib/realplay-10.0.6/share/locale/fr
-/usr/lib/realplay-10.0.6/share/locale/hi
-/usr/lib/realplay-10.0.6/share/locale/it
-/usr/lib/realplay-10.0.6/share/locale/ja
-/usr/lib/realplay-10.0.6/share/locale/ko
-/usr/lib/realplay-10.0.6/share/locale/pl_BR
-/usr/lib/realplay-10.0.6/share/locale/pt_BR
-/usr/lib/realplay-10.0.6/share/locale/zh_CN
-/usr/lib/realplay-10.0.6/share/locale/zh_TW
+/usr/lib/realplay-10.0.7/common
+/usr/lib/realplay-10.0.7/codecs
+/usr/lib/realplay-10.0.7/plugins
+/usr/lib/realplay-10.0.7/share/default
+/usr/lib/realplay-10.0.7/share/realplay
+/usr/lib/realplay-10.0.7/share/locale/de
+/usr/lib/realplay-10.0.7/share/locale/es
+/usr/lib/realplay-10.0.7/share/locale/fr
+/usr/lib/realplay-10.0.7/share/locale/hi
+/usr/lib/realplay-10.0.7/share/locale/it
+/usr/lib/realplay-10.0.7/share/locale/ja
+/usr/lib/realplay-10.0.7/share/locale/ko
+/usr/lib/realplay-10.0.7/share/locale/pl_BR
+/usr/lib/realplay-10.0.7/share/locale/pt_BR
+/usr/lib/realplay-10.0.7/share/locale/zh_CN
+/usr/lib/realplay-10.0.7/share/locale/zh_TW
/usr/lib/mozilla/plugins
/usr/share/locale/de/LC_MESSAGES
/usr/share/locale/es/LC_MESSAGES
Index: realplay.links
===================================================================
RCS file: /cvsroot/player/installer/deb/linspire-5.0/Attic/realplay.links,v
retrieving revision 1.1.4.1.2.3
retrieving revision 1.1.4.1.2.4
diff -u -d -r1.1.4.1.2.3 -r1.1.4.1.2.4
--- realplay.links 19 Aug 2005 22:39:19 -0000 1.1.4.1.2.3
+++ realplay.links 28 Feb 2006 22:16:04 -0000 1.1.4.1.2.4
@@ -1 +1 @@
-/usr/lib/realplay-10.0.6/realplay /usr/bin/realplay
+/usr/lib/realplay-10.0.7/realplay /usr/bin/realplay
Index: changelog
===================================================================
RCS file: /cvsroot/player/installer/deb/linspire-5.0/Attic/changelog,v
retrieving revision 1.1.4.1.2.4
retrieving revision 1.1.4.1.2.5
diff -u -d -r1.1.4.1.2.4 -r1.1.4.1.2.5
--- changelog 19 Aug 2005 22:39:19 -0000 1.1.4.1.2.4
+++ changelog 28 Feb 2006 22:16:04 -0000 1.1.4.1.2.5
@@ -1,3 +1,9 @@
+realplay (10.0.7-0.0.0.5.linspire0.5) unstable; urgency=low
+
+ * Updating to 10.0.7
+
+ -- Bob Clark Fri, 28 Feb 2006 15:00:00 -0800
+
realplay (10.0.6-0.0.0.5.linspire0.5) unstable; urgency=low
* Updating to 10.0.6
From bobclark at helixcommunity.org Tue Feb 28 14:16:06 2006
From: bobclark at helixcommunity.org (bobclark@helixcommunity.org)
Date: Tue Feb 28 16:25:02 2006
Subject: [Player-cvs] installer/deb/xandros-3.0 changelog, 1.1.4.2.2.3,
1.1.4.2.2.4 realplay.dirs, 1.1.4.4.2.3,
1.1.4.4.2.4 realplay.links, 1.1.4.2.2.3, 1.1.4.2.2.4 rules,
1.1.4.3.2.3, 1.1.4.3.2.4
Message-ID:
Update of /cvsroot/player/installer/deb/xandros-3.0
In directory cvs:/tmp/cvs-serv30828/deb/xandros-3.0
Modified Files:
Tag: bingo_release_10_0_3
changelog realplay.dirs realplay.links rules
Log Message:
update to 10.0.7
Index: rules
===================================================================
RCS file: /cvsroot/player/installer/deb/xandros-3.0/Attic/rules,v
retrieving revision 1.1.4.3.2.3
retrieving revision 1.1.4.3.2.4
diff -u -d -r1.1.4.3.2.3 -r1.1.4.3.2.4
--- rules 19 Aug 2005 22:35:30 -0000 1.1.4.3.2.3
+++ rules 28 Feb 2006 22:16:04 -0000 1.1.4.3.2.4
@@ -54,7 +54,7 @@
BUILD_ROOT:=$(shell pwd)/debian/realplay
-REALPLAY_VERSION=realplay-10.0.6
+REALPLAY_VERSION=realplay-10.0.7
build: build-stamp
build-stamp: patch
Index: realplay.dirs
===================================================================
RCS file: /cvsroot/player/installer/deb/xandros-3.0/Attic/realplay.dirs,v
retrieving revision 1.1.4.4.2.3
retrieving revision 1.1.4.4.2.4
diff -u -d -r1.1.4.4.2.3 -r1.1.4.4.2.4
--- realplay.dirs 19 Aug 2005 22:35:30 -0000 1.1.4.4.2.3
+++ realplay.dirs 28 Feb 2006 22:16:04 -0000 1.1.4.4.2.4
@@ -1,20 +1,20 @@
/usr/bin
-/usr/lib/realplay-10.0.6/common
-/usr/lib/realplay-10.0.6/codecs
-/usr/lib/realplay-10.0.6/plugins
-/usr/lib/realplay-10.0.6/share/default
-/usr/lib/realplay-10.0.6/share/realplay
-/usr/lib/realplay-10.0.6/share/locale/de
-/usr/lib/realplay-10.0.6/share/locale/es
-/usr/lib/realplay-10.0.6/share/locale/fr
-/usr/lib/realplay-10.0.6/share/locale/hi
-/usr/lib/realplay-10.0.6/share/locale/it
-/usr/lib/realplay-10.0.6/share/locale/ja
-/usr/lib/realplay-10.0.6/share/locale/ko
-/usr/lib/realplay-10.0.6/share/locale/pl
-/usr/lib/realplay-10.0.6/share/locale/pt_BR
-/usr/lib/realplay-10.0.6/share/locale/zh_CN
-/usr/lib/realplay-10.0.6/share/locale/zh_TW
+/usr/lib/realplay-10.0.7/common
+/usr/lib/realplay-10.0.7/codecs
+/usr/lib/realplay-10.0.7/plugins
+/usr/lib/realplay-10.0.7/share/default
+/usr/lib/realplay-10.0.7/share/realplay
+/usr/lib/realplay-10.0.7/share/locale/de
+/usr/lib/realplay-10.0.7/share/locale/es
+/usr/lib/realplay-10.0.7/share/locale/fr
+/usr/lib/realplay-10.0.7/share/locale/hi
+/usr/lib/realplay-10.0.7/share/locale/it
+/usr/lib/realplay-10.0.7/share/locale/ja
+/usr/lib/realplay-10.0.7/share/locale/ko
+/usr/lib/realplay-10.0.7/share/locale/pl
+/usr/lib/realplay-10.0.7/share/locale/pt_BR
+/usr/lib/realplay-10.0.7/share/locale/zh_CN
+/usr/lib/realplay-10.0.7/share/locale/zh_TW
/usr/lib/mozilla/plugins
/usr/share/locale/de/LC_MESSAGES
/usr/share/locale/es/LC_MESSAGES
Index: realplay.links
===================================================================
RCS file: /cvsroot/player/installer/deb/xandros-3.0/Attic/realplay.links,v
retrieving revision 1.1.4.2.2.3
retrieving revision 1.1.4.2.2.4
diff -u -d -r1.1.4.2.2.3 -r1.1.4.2.2.4
--- realplay.links 19 Aug 2005 22:35:30 -0000 1.1.4.2.2.3
+++ realplay.links 28 Feb 2006 22:16:04 -0000 1.1.4.2.2.4
@@ -1 +1 @@
-/usr/lib/realplay-10.0.6/realplay /usr/bin/realplay
+/usr/lib/realplay-10.0.7/realplay /usr/bin/realplay
Index: changelog
===================================================================
RCS file: /cvsroot/player/installer/deb/xandros-3.0/Attic/changelog,v
retrieving revision 1.1.4.2.2.3
retrieving revision 1.1.4.2.2.4
diff -u -d -r1.1.4.2.2.3 -r1.1.4.2.2.4
--- changelog 19 Aug 2005 22:35:30 -0000 1.1.4.2.2.3
+++ changelog 28 Feb 2006 22:16:04 -0000 1.1.4.2.2.4
@@ -1,3 +1,9 @@
+realplay (10.0.7-1) unstable; urgency=low
+
+ * Updating for 10.0.7
+
+ -- Bob Clark Tue, 28 Feb 2006 15:00:00 -0800
+
realplay (10.0.6-1) unstable; urgency=low
* Updating for 10.0.6
From bobclark at helixcommunity.org Tue Feb 28 14:19:16 2006
From: bobclark at helixcommunity.org (bobclark@helixcommunity.org)
Date: Tue Feb 28 16:28:11 2006
Subject: [Player-cvs] app/gtk hxplayer.ver, 1.186.2.363.2.53,
1.186.2.363.2.54 realplayer.ver, 1.1.2.304.2.53, 1.1.2.304.2.54
Message-ID:
Update of /cvsroot/player/app/gtk
In directory cvs:/tmp/cvs-serv30934
Modified Files:
Tag: bingo_release_10_0_3
hxplayer.ver realplayer.ver
Log Message:
roll back version to 784
Index: realplayer.ver
===================================================================
RCS file: /cvsroot/player/app/gtk/realplayer.ver,v
retrieving revision 1.1.2.304.2.53
retrieving revision 1.1.2.304.2.54
diff -u -d -r1.1.2.304.2.53 -r1.1.2.304.2.54
--- realplayer.ver 28 Feb 2006 03:00:40 -0000 1.1.2.304.2.53
+++ realplayer.ver 28 Feb 2006 22:19:14 -0000 1.1.2.304.2.54
@@ -2,12 +2,12 @@
* Copyright (C) 1997-2002 RealNetworks Corporation. All rights reserved.
*/
#ifdef _MACINTOSH
-#define TARVER_ULONG32_VERSION ((10<<28)|(0<<20)|(7<<12)|790)
+#define TARVER_ULONG32_VERSION ((10<<28)|(0<<20)|(7<<12)|784)
#else
-#define TARVER_ULONG32_VERSION (UINT32)((10L<<28L)|(0L<<20L)|(7L<< 12L)|790L)
+#define TARVER_ULONG32_VERSION (UINT32)((10L<<28L)|(0L<<20L)|(7L<< 12L)|784L)
#endif
-#define TARVER_LIST_VERSION 10,0,7,790
+#define TARVER_LIST_VERSION 10,0,7,784
#define TARVER_MAJOR_VERSION 10
#define TARVER_MINOR_VERSION 0
-#define TARVER_STRING_VERSION "10.0.7.790"
+#define TARVER_STRING_VERSION "10.0.7.784"
#define TARVER_STR_BUILD_NAME ""
Index: hxplayer.ver
===================================================================
RCS file: /cvsroot/player/app/gtk/hxplayer.ver,v
retrieving revision 1.186.2.363.2.53
retrieving revision 1.186.2.363.2.54
diff -u -d -r1.186.2.363.2.53 -r1.186.2.363.2.54
--- hxplayer.ver 28 Feb 2006 03:00:36 -0000 1.186.2.363.2.53
+++ hxplayer.ver 28 Feb 2006 22:19:13 -0000 1.186.2.363.2.54
@@ -2,12 +2,12 @@
* Copyright (C) 1997-2002 RealNetworks Corporation. All rights reserved.
*/
#ifdef _MACINTOSH
-#define TARVER_ULONG32_VERSION ((1<<28)|(0<<20)|(7<<12)|790)
+#define TARVER_ULONG32_VERSION ((1<<28)|(0<<20)|(7<<12)|784)
#else
-#define TARVER_ULONG32_VERSION (UINT32)((1L<<28L)|(0L<<20L)|(7L<< 12L)|790L)
+#define TARVER_ULONG32_VERSION (UINT32)((1L<<28L)|(0L<<20L)|(7L<< 12L)|784L)
#endif
-#define TARVER_LIST_VERSION 1,0,7,790
+#define TARVER_LIST_VERSION 1,0,7,784
#define TARVER_MAJOR_VERSION 1
#define TARVER_MINOR_VERSION 0
-#define TARVER_STRING_VERSION "1.0.7.790"
+#define TARVER_STRING_VERSION "1.0.7.784"
#define TARVER_STR_BUILD_NAME ""
From bobclark at helixcommunity.org Tue Feb 28 15:45:04 2006
From: bobclark at helixcommunity.org (bobclark@helixcommunity.org)
Date: Tue Feb 28 17:54:00 2006
Subject: [Player-cvs] installer/rpm RealPlayer-rhel4.spec, 1.1.4.4.2.4,
1.1.4.4.2.5 RealPlayer-turbo10.spec, 1.1.2.6.2.4, 1.1.2.6.2.5
Message-ID:
Update of /cvsroot/player/installer/rpm
In directory cvs:/tmp/cvs-serv23978/rpm
Modified Files:
Tag: bingo_release_10_0_3
RealPlayer-rhel4.spec RealPlayer-turbo10.spec
Log Message:
clean up date format for changelog
Index: RealPlayer-turbo10.spec
===================================================================
RCS file: /cvsroot/player/installer/rpm/Attic/RealPlayer-turbo10.spec,v
retrieving revision 1.1.2.6.2.4
retrieving revision 1.1.2.6.2.5
diff -u -d -r1.1.2.6.2.4 -r1.1.2.6.2.5
--- RealPlayer-turbo10.spec 28 Feb 2006 21:50:36 -0000 1.1.2.6.2.4
+++ RealPlayer-turbo10.spec 28 Feb 2006 23:45:02 -0000 1.1.2.6.2.5
@@ -193,7 +193,9 @@
%{_datadir}/locale/*/LC_MESSAGES/*
%changelog
-* 28 Feb 06 bobclark@real.com 10.0.7
+* Tue Feb 28 2006 Bob Clark 10.0.7
+- Updating for 10.0.7
+
* Fri Aug 19 2005 Ryan Gammon 10.0.6
- Updating for 10.0.6
Index: RealPlayer-rhel4.spec
===================================================================
RCS file: /cvsroot/player/installer/rpm/Attic/RealPlayer-rhel4.spec,v
retrieving revision 1.1.4.4.2.4
retrieving revision 1.1.4.4.2.5
diff -u -d -r1.1.4.4.2.4 -r1.1.4.4.2.5
--- RealPlayer-rhel4.spec 28 Feb 2006 21:50:36 -0000 1.1.4.4.2.4
+++ RealPlayer-rhel4.spec 28 Feb 2006 23:45:02 -0000 1.1.4.4.2.5
@@ -154,7 +154,8 @@
%{_datadir}/locale/*/LC_MESSAGES/*
%changelog
-* 28 Feb 06 bobclark@real.com 10.0.7
+* Tue Feb 28 2006 Bob Clark 10.0.7-1
+- Updating to 10.0.7
* Fri Aug 19 2005 Ryan Gammon 10.0.6-1
- Updating to 10.0.6
From bobclark at helixcommunity.org Tue Feb 28 16:28:24 2006
From: bobclark at helixcommunity.org (bobclark@helixcommunity.org)
Date: Tue Feb 28 18:37:18 2006
Subject: [Player-cvs] app/gtk hxplayer.ver, 1.186.2.363.2.57,
1.186.2.363.2.58 realplayer.ver, 1.1.2.304.2.57, 1.1.2.304.2.58
Message-ID:
Update of /cvsroot/player/app/gtk
In directory cvs:/tmp/cvs-serv11237
Modified Files:
Tag: bingo_release_10_0_3
hxplayer.ver realplayer.ver
Log Message:
roll back versions for distro build
Index: realplayer.ver
===================================================================
RCS file: /cvsroot/player/app/gtk/realplayer.ver,v
retrieving revision 1.1.2.304.2.57
retrieving revision 1.1.2.304.2.58
diff -u -d -r1.1.2.304.2.57 -r1.1.2.304.2.58
--- realplayer.ver 28 Feb 2006 23:53:15 -0000 1.1.2.304.2.57
+++ realplayer.ver 1 Mar 2006 00:28:22 -0000 1.1.2.304.2.58
@@ -2,12 +2,12 @@
* Copyright (C) 1997-2002 RealNetworks Corporation. All rights reserved.
*/
#ifdef _MACINTOSH
-#define TARVER_ULONG32_VERSION ((10<<28)|(0<<20)|(7<<12)|787)
+#define TARVER_ULONG32_VERSION ((10<<28)|(0<<20)|(7<<12)|784)
#else
-#define TARVER_ULONG32_VERSION (UINT32)((10L<<28L)|(0L<<20L)|(7L<< 12L)|787L)
+#define TARVER_ULONG32_VERSION (UINT32)((10L<<28L)|(0L<<20L)|(7L<< 12L)|784L)
#endif
-#define TARVER_LIST_VERSION 10,0,7,787
+#define TARVER_LIST_VERSION 10,0,7,784
#define TARVER_MAJOR_VERSION 10
#define TARVER_MINOR_VERSION 0
-#define TARVER_STRING_VERSION "10.0.7.787"
+#define TARVER_STRING_VERSION "10.0.7.784"
#define TARVER_STR_BUILD_NAME ""
Index: hxplayer.ver
===================================================================
RCS file: /cvsroot/player/app/gtk/hxplayer.ver,v
retrieving revision 1.186.2.363.2.57
retrieving revision 1.186.2.363.2.58
diff -u -d -r1.186.2.363.2.57 -r1.186.2.363.2.58
--- hxplayer.ver 28 Feb 2006 23:53:12 -0000 1.186.2.363.2.57
+++ hxplayer.ver 1 Mar 2006 00:28:22 -0000 1.186.2.363.2.58
@@ -2,12 +2,12 @@
* Copyright (C) 1997-2002 RealNetworks Corporation. All rights reserved.
*/
#ifdef _MACINTOSH
-#define TARVER_ULONG32_VERSION ((1<<28)|(0<<20)|(7<<12)|787)
+#define TARVER_ULONG32_VERSION ((1<<28)|(0<<20)|(7<<12)|784)
#else
-#define TARVER_ULONG32_VERSION (UINT32)((1L<<28L)|(0L<<20L)|(7L<< 12L)|787L)
+#define TARVER_ULONG32_VERSION (UINT32)((1L<<28L)|(0L<<20L)|(7L<< 12L)|784L)
#endif
-#define TARVER_LIST_VERSION 1,0,7,787
+#define TARVER_LIST_VERSION 1,0,7,784
#define TARVER_MAJOR_VERSION 1
#define TARVER_MINOR_VERSION 0
-#define TARVER_STRING_VERSION "1.0.7.787"
+#define TARVER_STRING_VERSION "1.0.7.784"
#define TARVER_STR_BUILD_NA
Copyright © 1995-2007 RealNetworks, Inc. All rights reserved.
RealNetworks and Helix are trademarks of RealNetworks.
All other trademarks or registered trademarks are the property of their respective holders.